fog 0.0.93 → 0.0.94

data/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb

@@ -0,0 +1,94 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+
+          # Get details of a vdc
+          def get_vdc(vdc_uri)
+            request(
+              :expects  => 200,
+              :method   => 'GET',
+              :parser   => Fog::Parsers::Vcloud::Terremark::Ecloud::GetVdc.new,
+              :uri      => vdc_uri
+            )
+          end
+        end
+
+        module Mock
+          #
+          #Based off of:
+          #http://support.theenterprisecloud.com/kb/default.asp?id=545&Lang=1&SID=
+
+          def get_vdc(vdc_uri)
+            if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:href] == vdc_uri }
+              xml = Builder::XmlMarkup.new
+              mock_it Fog::Parsers::Vcloud::Terremark::Ecloud::GetVdc.new, 200,
+                xml.Vdc(xmlns.merge(:href => vdc[:href], :name => vdc[:name])) {
+                  xml.Link(:rel => "down",
+                           :href => vdc[:href] + "/catalog",
+                           :type => "application/vnd.vmware.vcloud.catalog+xml",
+                           :name => vdc[:name])
+                  xml.Link(:rel => "down",
+                           :href => vdc[:href].gsub('/vdc','/extensions/vdc') + "/publicIps",
+                           :type => "application/vnd.tmrk.ecloud.publicIpsList+xml",
+                           :name => "Public IPs")
+                  xml.Link(:rel => "down",
+                           :href => vdc[:href] + "/internetServices",
+                           :type => "application/vnd.tmrk.ecloud.internetServicesList+xml",
+                           :name => "Internet Services")
+                  xml.Link(:rel => "down",
+                           :href => vdc[:href].sub('/vdc','/extensions/vdc') + "/firewallAcls",
+                           :type => "application/vnd.tmrk.ecloud.firewallAclsList+xml",
+                           :name => "Firewall Access List")
+                  xml.Description("")
+                  xml.StorageCapacity {
+                    xml.Units("bytes * 10^9")
+                    xml.Allocated(vdc[:storage][:allocated])
+                    xml.Used(vdc[:storage][:used])
+                  }
+                  xml.ComputeCapacity {
+                    xml.Cpu {
+                      xml.Units("hz * 10^6")
+                      xml.Allocated(vdc[:cpu][:allocated])
+                    }
+                    xml.Memory {
+                      xml.Units("bytes * 2^20")
+                      xml.Allocated(vdc[:memory][:allocated])
+                    }
+                    xml.DeployedVmsQuota {
+                      xml.Limit("-1")
+                      xml.Used("-1")
+                    }
+                    xml.InstantiatedVmsQuota {
+                      xml.Limit("-1")
+                      xml.Used("-1")
+                    }
+                  }
+                  xml.ResourceEntities {
+                    vdc[:vms].each do |vm|
+                      xml.ResourceEntity(:href => vm[:href],
+                                         :type => "application/vnd.vmware.vcloud.vApp+xml",
+                                         :name => vm[:name])
+                    end
+                  }
+                  xml.AvailableNetworks {
+                    vdc[:networks].each do |network|
+                      xml.Network(:href => network[:href],
+                                  :type => "application/vnd.vmware.vcloud.network+xml",
+                                  :name => network[:name])
+                    end
+                  }
+                }, { 'Content-Type' => 'application/vnd.vmware.vcloud.vdc+xml'}
+            else
+              mock_error 200, "401 Unauthorized"
+            end
+          end
+
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/vcloud/terremark/ecloud/requests/login.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+        module Real
+
+          # See /lib/fog/vcloud/requests/get_organizations.rb
+          def login
+            unauthenticated_request({
+              :expects  => 200,
+              :headers  => {
+                'Authorization' => authorization_header,
+                'Content-Type'  => "application/vnd.vmware.vcloud.orgList+xml"
+              },
+              :method   => 'POST',
+              :parser   => Fog::Parsers::Vcloud::Login.new,
+              :uri      => @login_uri
+            })
+          end
+
+        end
+      end
+    end
+  end
+end
+
+

data/lib/fog/vcloud/terremark/vcloud.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Vcloud
+
+        module Versions
+          SUPPORTED = ["v0.8"]
+        end
+
+        def self.extended(klass)
+          #Do anything we need to do here that's specific to ecloud
+          unless @required
+            require 'fog/vcloud/terremark/all'
+            require 'fog/vcloud/terremark/vcloud/parsers/get_vdc'
+            require 'fog/vcloud/terremark/vcloud/requests/get_vdc'
+            Struct.new("TmrkVcloudVdc", :links, :resource_entities, :networks, :href, :type, :name, :xmlns)
+            @required = true
+          end
+          if Fog.mocking?
+            klass.extend Fog::Vcloud::Terremark::Vcloud::Mock
+          else
+            klass.extend Fog::Vcloud::Terremark::Vcloud::Real
+          end
+        end
+
+        private
+
+        # If we don't support any versions the service does, then raise an error.
+        # If the @version that super selected isn't in our supported list, then select one that is.
+        def check_versions
+          super
+          unless (supported_version_ids & Versions::SUPPORTED).length > 0
+            raise UnsupportedVersion.new("\nService @ #{@versions_uri} supports: #{supported_version_ids.join(', ')}\n" +
+                                         "Fog::Vcloud::Terremark::Vcloud supports: #{Versions::SUPPORTED.join(', ')}")
+          end
+          unless supported_version_ids.include?(@version)
+            @version = (supported_version_ids & Versions::SUPPORTED).sort.first
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/terremark/vcloud/parsers/get_vdc.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module Vcloud
+      module Terremark
+        module Vcloud
+
+          class GetVdc < Fog::Parsers::Vcloud::Base
+
+            def reset
+              @target = nil
+              @response = Struct::TmrkVcloudVdc.new([],[],[])
+            end
+
+            def start_element(name, attributes)
+              @value = ''
+              case name
+              when 'Link'
+                @response.links << generate_link(attributes)
+              when 'Network'
+                @response.networks << generate_link(attributes)
+              when 'ResourceEntity'
+                @response.resource_entities << generate_link(attributes)
+              when 'Vdc'
+                handle_root(attributes)
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb

@@ -0,0 +1,65 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Vcloud
+
+        module Real
+
+          # Get details of a vdc
+          def get_vdc(vdc_uri)
+            request(
+              :expects  => 200,
+              :method   => 'GET',
+              :parser   => Fog::Parsers::Vcloud::Terremark::Vcloud::GetVdc.new,
+              :uri      => vdc_uri
+            )
+          end
+        end
+
+        module Mock
+          #
+          #Based off of:
+          #https://community.vcloudexpress.terremark.com/en-us/product_docs/w/wiki/09-get-vdc.aspx
+
+          def get_vdc(vdc_uri)
+            if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:href] == vdc_uri }
+              xml = Builder::XmlMarkup.new
+              mock_it Fog::Parsers::Vcloud::Terremark::Vcloud::GetVdc.new, 200,
+                xml.Vdc(xmlns.merge(:href => vdc[:href], :name => vdc[:name])) {
+                  xml.Link(:rel => "down",
+                           :href => vdc[:href] + "/catalog",
+                           :type => "application/vnd.vmware.vcloud.catalog+xml",
+                           :name => vdc[:name])
+                  xml.Link(:rel => "down",
+                           :href => vdc[:href] + "/publicIps",
+                           :type => "application/xml",
+                           :name => "Public IPs")
+                  xml.Link(:rel => "down",
+                           :href => vdc[:href] + "/internetServices",
+                           :type => "application/xml",
+                           :name => "Internet Services")
+                  xml.ResourceEntities {
+                    vdc[:vms].each do |vm|
+                      xml.ResourceEntity(:href => vm[:href],
+                                         :type => "application/vnd.vmware.vcloud.vApp+xml",
+                                         :name => vm[:name])
+                    end
+                  }
+                  xml.AvailableNetworks {
+                    vdc[:networks].each do |network|
+                      xml.Network(:href => network[:href],
+                                  :type => "application/vnd.vmware.vcloud.network+xml",
+                                  :name => network[:name])
+                    end
+                  }
+                }, { 'Content-Type' => 'application/vnd.vmware.vcloud.vdc+xml'}
+            else
+              mock_error 200, "401 Unauthorized"
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/spec/aws/requests/ec2/describe_instances_spec.rb

@@ -33,7 +33,7 @@ describe 'EC2.describe_instances' do
       instance['instanceState']['code'].should be_a(Integer)
       instance['instanceState']['name'].should be_a(String)
       instance['instanceType'].should be_a(String)
-      # instance['ipAddress'].should be_a(String)
+      instance['ipAddress'].should be_a(String)
       instance['kernelId'].should be_a(String)
       instance['keyName'].should be_a(String) if instance['keyName']
       instance['launchTime'].should be_a(Time)
@@ -42,7 +42,7 @@ describe 'EC2.describe_instances' do
       instance['placement'].should be_a(Hash)
       instance['placement']['availabilityZone'].should be_a(String)
       instance['privateDnsName'].should be_a(String)
-      # instance['privateIpAddress'].should be_a(String)
+      instance['privateIpAddress'].should be_a(String)
       instance['productCodes'].should be_an(Array)
       instance['productCodes'].first.should be_a(String) if instance['productCodes'].first
       instance['ramdiskId'].should be_a(String)
@@ -71,7 +71,7 @@ describe 'EC2.describe_instances' do
       instance['instanceState']['code'].should be_a(Integer)
       instance['instanceState']['name'].should be_a(String)
       instance['instanceType'].should be_a(String)
-      # instance['ipAddress'].should be_a(String)
+      instance['ipAddress'].should be_a(String)
       instance['kernelId'].should be_a(String)
       instance['keyName'].should be_a(String) if instance['keyName']
       instance['launchTime'].should be_a(Time)
@@ -80,7 +80,7 @@ describe 'EC2.describe_instances' do
       instance['placement'].should be_a(Hash)
       instance['placement']['availabilityZone'].should be_a(String)
       instance['privateDnsName'].should be_a(String)
-      # instance['privateIpAddress'].should be_a(String)
+      instance['privateIpAddress'].should be_a(String)
       instance['productCodes'].should be_an(Array)
       instance['productCodes'].first.should be_a(String) if instance['productCodes'].first
       instance['ramdiskId'].should be_a(String)

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end
 
+require "#{current_directory}/../lib/fog/vcloud/bin"
+
 module AWS
   class << self
     def [](service)
@@ -100,4 +102,4 @@ end
 
 def lorem_file
   File.open(File.dirname(__FILE__) + '/lorem.txt', 'r')
-end
+end

data/spec/vcloud/bin_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Vcloud do
+  it { should be_initialized }
+
+  it { should have(2).services }
+
+  describe "#registered_services" do
+    subject { Vcloud.registered_services }
+
+    it { should == ":ecloud, :vcloud" }
+  end
+
+  describe "when indexing it like an array" do
+    describe "with a service that exists" do
+      before do
+        Fog::Vcloud.should_receive(:new).and_return(true)
+      end
+      it "should return something when indexed with a configured service" do
+        Vcloud[:ecloud].should_not be_nil
+      end
+    end
+
+    describe "with a service that does not exist" do
+      it "should raise an ArgumentError" do
+        lambda {Vcloud[:foozle]}.should raise_error(ArgumentError)
+      end
+    end
+
+  end
+end

data/spec/vcloud/requests/get_organization_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Fog::Vcloud, :type => :vcloud_request do
+  subject { @vcloud }
+
+  it { should respond_to :get_organization }
+
+  describe "#get_organization" do
+    context "with a valid organization uri" do
+      before { @organization = @vcloud.get_organization(@vcloud.default_organization_uri) }
+      subject { @organization }
+
+      it_should_behave_like "all requests"
+
+      its(:headers) { should include "Content-Type" }
+      its(:body) { should be_an_instance_of Struct::VcloudOrganization }
+
+      describe :headers do
+        let(:header){ @organization.headers["Content-Type"] }
+        specify{ header.should == "application/vnd.vmware.vcloud.org+xml" }
+      end
+
+      describe "#body" do
+        subject { @organization.body }
+
+        it_should_behave_like "it has a vcloud v0.8 xmlns"
+
+        its(:links) { should have(@mock_organization[:vdcs].length * 3).links }
+        its(:name) { should == @mock_organization[:info][:name] }
+        its(:href) { should == @mock_organization[:info][:href] }
+
+        let(:link) { subject.links[0] }
+        specify { link.should be_an_instance_of Struct::VcloudLink }
+        specify { link.rel.should == "down" }
+        specify { link.href.should == @mock_vdc[:href] }
+        specify { link.type.should == "application/vnd.vmware.vcloud.vdc+xml" }
+        specify { link.name.should == @mock_vdc[:name] }
+      end
+    end
+    context "with an organization uri that doesn't exist" do
+      subject { lambda { @vcloud.get_organization(URI.parse('https://www.fakey.com/api/v0.8/org/999')) } }
+      it_should_behave_like "a request for a resource that doesn't exist"
+    end
+  end
+end
+

data/spec/vcloud/requests/get_vdc_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+#
+# WARNING: INCOMPLETE
+#
+
+describe Fog::Vcloud, :type => :vcloud_request do
+  subject { @vcloud }
+
+  it { should respond_to :get_vdc }
+
+  describe :get_vdc, :type => :vcloud_request do
+    context "with a valid vdc uri" do
+      before { @vdc = @vcloud.get_vdc(@mock_vdc[:href]) }
+      subject { @vdc }
+
+      it_should_behave_like "all requests"
+
+      its(:headers) { should include "Content-Type" }
+      its(:body) { should be_an_instance_of Struct::VcloudVdc }
+
+      describe :headers do
+        let(:header) { @vdc.headers["Content-Type"] }
+        specify { header.should == "application/vnd.vmware.vcloud.vdc+xml" }
+      end
+
+      describe :body do
+        subject { @vdc.body }
+
+        it_should_behave_like "it has a vcloud v0.8 xmlns"
+
+        its(:links) { should have(7).links }
+        its(:name) { should == @mock_vdc[:name] }
+        its(:href) { should == @mock_vdc[:href] }
+
+        let(:link) { subject.links[0] }
+        specify { link.should be_an_instance_of Struct::VcloudLink }
+        specify { link.rel.should == "up" }
+        specify { link.href.should == @mock_organization[:info][:href] }
+        specify { link.type.should == "application/vnd.vmware.vcloud.org+xml" }
+      end
+    end
+    context "with a vdc uri that doesn't exist" do
+      subject { lambda { @vcloud.get_vdc(URI.parse('https://www.fakey.com/api/v0.8/vdc/999')) } }
+      it_should_behave_like "a request for a resource that doesn't exist"
+    end
+  end
+end
+
+