fog 0.1.4 → 0.1.5

data/lib/fog/vcloud/model.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Vcloud
+    class Model < Fog::Model
+
+      #def self.attribute(name, other_names = [])
+      #  super
+      #  class_eval <<-EOS, __FILE__, __LINE__
+      #    def #{name}=(new_#{name})
+      #      @#{name} = new_#{name}
+      #    end
+      #  EOS
+      #end
+
+      def self.inherited(klass)
+          attributes.each { |attribute| klass.attribute attribute }
+          klass.instance_variable_set(:@identity, @identity)
+          klass.instance_variable_set(:@aliases, @aliases)
+        end
+
+      def self.delete_attribute(name)
+        if @attributes.reject! { |item| item == name }
+          class_eval <<-EOS,__FILE__,__LINE__
+            undef_method :#{name}
+            undef_method :#{name}=
+          EOS
+          aliases.reject! { |key, value| value == name || key == name }
+        end
+      end
+
+      def reload
+        if data = collection.get_raw(identity)
+          merge_get_raw_result(data)
+          self
+        end
+      end
+
+      def merge_get_raw_result(data)
+        data.body.each_pair do |key,value|
+          if aliased_key = self.class.aliases[key]
+            send("#{aliased_key}=", value)
+          else
+            send("#{key}=", value)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud/models/vdc.rb

@@ -0,0 +1,36 @@
+require 'fog/model'
+
+module Fog
+  module Vcloud
+    class Vdc < Fog::Vcloud::Model
+
+      identity :href
+
+      attribute :name
+      attribute :other_links, :links
+      attribute :resource_entity_links, :resource_entities
+      attribute :network_links, :networks
+      attribute :cpu_capacity
+      attribute :storage_capacity
+      attribute :memory_capacity
+      attribute :vm_quota
+      attribute :enabled
+      attribute :nic_quota
+      attribute :network_quota
+      attribute :vcloud_type, :type
+      attribute :xmlns
+      attribute :description
+      attribute :allocation_model
+
+      #def networks
+      #  connection.networks(:vdc_uri => @uri)
+      #end
+
+      #def addresses
+      #  connection.addresses(:vdc_uri => @uri)
+      #end
+
+    end
+
+  end
+end

data/lib/fog/vcloud/models/vdcs.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Vcloud
+    class Mock
+      def vdcs(options = {})
+        @vdcs ||= Fog::Vcloud::Vdcs.new(options.merge(:connection => self))
+      end
+    end
+
+    class Real
+      def vdcs(options = {})
+        @vdcs ||= Fog::Vcloud::Vdcs.new(options.merge(:connection => self))
+      end
+    end
+
+    class Vdcs < Fog::Vcloud::Collection
+
+      model Fog::Vcloud::Vdc
+
+      get_request :get_vdc
+      vcloud_type "application/vnd.vmware.vcloud.vdc+xml"
+      all_request lambda { |vdcs| vdcs.connection.get_organization(vdcs.organization_uri) }
+
+      def organization_uri
+        @organizatio_uri ||= connection.default_organization_uri
+      end
+
+      private
+
+      def organization_uri=(new_organization_uri)
+        @organization_uri = new_organization_uri
+      end
+
+    end
+
+  end
+end

data/lib/fog/vcloud/parser.rb

@@ -10,6 +10,9 @@ module Fog
           until attributes.empty?
             link[attributes.shift.downcase] = attributes.shift
           end
+          if link.href
+            link.href = URI.parse(link.href)
+          end
           link
         end
 
@@ -23,7 +26,7 @@ module Fog
               root[attributes.shift.downcase] = attributes.shift
             end
           end
-          @response.href = root['href']
+          @response.href = URI.parse(root['href'])
           @response.name = root['name']
           @response.type = root['type']
           @response.xmlns = root['xmlns']

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

@@ -8,14 +8,31 @@ module Fog
         #vCloud API Guide v0.9 - Page 27
 
         def reset
-          @response = Struct::VcloudVdc.new([])
+          @target = nil
+          @response = Struct::VcloudVdc.new([],[],[],Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new)
         end
 
         def start_element(name, attributes)
           @value = ''
           case name
+          when 'Cpu'
+            @target = :cpu_capacity
+          when 'Memory'
+            @target = :memory_capacity
+          when 'StorageCapacity'
+            @target = :storage_capacity
+          when 'NetworkQuota'
+            @target = :network_quota
+          when 'VmQuota'
+            @target = :vm_quota
+          when 'NicQuota'
+            @target = :nic_quota
           when 'Link'
             @response.links << generate_link(attributes)
+          when 'ResourceEntity'
+            @response.resource_entities << generate_link(attributes)
+          when 'Network'
+            @response.networks << generate_link(attributes)
           when 'Vdc'
             handle_root(attributes)
           end
@@ -23,10 +40,18 @@ module Fog
 
         def end_element(name)
           case name
+          when 'Allocated', 'Limit', 'Used'
+            @response[@target][name.downcase] = @value.to_i
+          when 'Units'
+            @response[@target][name.downcase] = @value
           when "AllocationModel"
             @response.allocation_model = @value
           when "Description"
             @response.description = @value
+          when "NicQuota", "VmQuota", "NetworkQuota"
+            @response[@target] = @value.to_i
+          when 'IsEnabled'
+            @response.enabled = (@value == 'true' ? true : false)
           end
         end
 

data/lib/fog/vcloud/parsers/login.rb

@@ -2,7 +2,7 @@ module Fog
   module Parsers
     module Vcloud
 
-      class Login < Fog::Parsers::Base
+      class Login < Fog::Parsers::Vcloud::Base
         #
         # Based off of:
         # http://support.theenterprisecloud.com/kb/default.asp?id=536&Lang=1&SID=
@@ -26,11 +26,7 @@ module Fog
               end
             end
           when 'Org'
-            organization = Struct::VcloudOrgLink.new
-            until attributes.empty?
-              organization[attributes.shift.downcase.to_sym] = attributes.shift
-            end
-            @response.organizations << organization
+            @response.organizations << generate_link(attributes)
           end
         end
 

data/lib/fog/vcloud/requests/get_organization.rb

@@ -23,7 +23,7 @@ module Fog
         # 
         # vCloud API Guide v0.9 - Page 26
         #
-        if org = DATA[:organizations].detect { |org| org[:info][:href] == organization_uri.to_s }
+        if org = mock_data[:organizations].detect { |org| URI.parse(org[:info][:href]) == organization_uri }
           xml = Builder::XmlMarkup.new
 
           mock_it Fog::Parsers::Vcloud::GetOrganization.new, 200,

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

@@ -20,7 +20,7 @@ module Fog
       #vCloud API Guide v0.9 - Page 27
 
       def get_vdc(vdc_uri)
-        if vdc = DATA[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:href] == vdc_uri }
+        if vdc = DATA[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| URI.parse(vdc[:href]) == vdc_uri }
           xml = Builder::XmlMarkup.new
           mock_it Fog::Parsers::Vcloud::GetVdc.new, 200,
             xml.Vdc(xmlns.merge(:href => vdc[:href], :name => vdc[:name])) {
@@ -47,6 +47,37 @@ module Fog
                        :href => vdc[:href] + "/action/composeVApp")
               xml.AllocationModel("AllocationPool")
               xml.Description(vdc[:name] + " VDC")
+              xml.ResourceEntities {
+                DATA[:vdc_resources].each do |resource|
+                  xml.ResourceEntity(resource)
+                end
+              }
+              xml.AvailableNetworks {
+                vdc[:networks].each do |network|
+                  xml.Network( :name => network[:name], :href => network[:href], :type => "application/vnd.vmware.vcloud.network+xml" )
+                end
+              }
+              xml.ComputeCapacity{
+                xml.Cpu {
+                  xml.Units("Mhz")
+                  xml.Allocated(vdc[:cpu][:allocated])
+                  xml.Limit(vdc[:cpu][:allocated])
+                }
+                xml.Memory {
+                  xml.Units("MB")
+                  xml.Allocated(vdc[:memory][:allocated])
+                  xml.Limit(vdc[:memory][:allocated])
+                }
+              }
+              xml.StorageCapacity{
+                xml.Units("MB")
+                xml.Allocated(vdc[:storage][:allocated])
+                xml.Limit(vdc[:storage][:allocated])
+              }
+              xml.VmQuota(0)
+              xml.NicQuota(0)
+              xml.IsEnabled('true')
+              xml.NetworkQuota(0)
               #FIXME: Incomplete
             }, { 'Content-Type' => 'application/vnd.vmware.vcloud.vdc+xml' }
         else

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

@@ -11,13 +11,14 @@ module Fog
           #Do anything we need to do here that's specific to ecloud
           unless @required
             require 'fog/vcloud/terremark/all'
+            require 'fog/vcloud/terremark/ecloud/models/vdc'
+            require 'fog/vcloud/terremark/ecloud/models/vdcs'
             require 'fog/vcloud/terremark/ecloud/parsers/get_vdc'
             require 'fog/vcloud/terremark/ecloud/requests/login'
             require 'fog/vcloud/terremark/ecloud/requests/get_vdc'
             Struct.new("TmrkEcloudVdc", :links, :resource_entities, :networks,
                        :cpu_capacity, :storage_capacity, :memory_capacity, :deployed_vm_quota, :instantiated_vm_quota,
                        :href, :type, :name, :xmlns, :description)
-            Struct.new("TmrkEcloudXCapacity", :units, :allocated, :used, :limit)
             @required = true
           end
           if Fog.mocking?

data/lib/fog/vcloud/terremark/ecloud/models/vdc.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+        class Vdc < Fog::Vcloud::Vdc
+
+          delete_attribute :enabled
+          delete_attribute :vm_quota
+          delete_attribute :nic_quota
+          delete_attribute :network_quota
+          delete_attribute :allocation_model
+
+          attribute :deployed_vm_quota
+          attribute :instantiated_vm_quota
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+        module Mock
+          def vdcs(options = {})
+            @vdcs ||= Fog::Vcloud::Terremark::Ecloud::Vdcs.new(options.merge(:connection => self))
+          end
+        end
+
+        module Real
+          def vdcs(options = {})
+            @vdcs ||= Fog::Vcloud::Terremark::Ecloud::Vdcs.new(options.merge(:connection => self))
+          end
+        end
+
+        class Vdcs < Fog::Vcloud::Vdcs
+
+          model Fog::Vcloud::Terremark::Ecloud::Vdc
+
+          #get_request :get_vdc
+          #vcloud_type "application/vnd.vmware.vcloud.vdc+xml"
+          #all_request lambda { |vdcs| vdcs.connection.get_organization(vdcs.organization_uri) }
+
+        end
+      end
+    end
+  end
+end

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

@@ -8,9 +8,9 @@ module Fog
 
             def reset
               @target = nil
-              @response = Struct::TmrkEcloudVdc.new([],[],[],Struct::TmrkEcloudXCapacity.new,Struct::TmrkEcloudXCapacity.new,
-                                                             Struct::TmrkEcloudXCapacity.new,Struct::TmrkEcloudXCapacity.new,
-                                                             Struct::TmrkEcloudXCapacity.new)
+              @response = Struct::TmrkEcloudVdc.new([],[],[],Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new,
+                                                             Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new,
+                                                             Struct::VcloudXCapacity.new)
             end
 
             def start_element(name, attributes)

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

@@ -22,7 +22,7 @@ module Fog
           #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 }
+            if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| URI.parse(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])) {

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

@@ -22,7 +22,7 @@ module Fog
           #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 }
+            if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| URI.parse(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])) {

data/spec/aws/models/ec2/snapshots_spec.rb

@@ -61,7 +61,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should return nil if no matching address exists" do
-      AWS[:ec2].snapshots.get('vol-00000000').should be_nil
+      AWS[:ec2].snapshots.get('snap-00000000').should be_nil
     end
 
   end

data/spec/shared_examples/servers_examples.rb

@@ -18,7 +18,7 @@ shared_examples_for "Servers" do
     end
 
     it "should return nil if no matching server exists" do
-      @servers.get('0').should be_nil
+      @servers.get('i-00000000').should be_nil
     end
 
   end

data/spec/vcloud/models/vdc_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Fog::Vcloud::Vdc", :type => :vcloud_model do
+
+  describe :class do
+    subject { Fog::Vcloud::Vdc }
+
+    it { should have_identity :href }
+
+    it { should have_only_these_attributes [:allocation_model, :cpu_capacity, :description, :enabled, :href, :memory_capacity, :name, :network_links, :network_quota,
+                                            :nic_quota, :other_links, :resource_entity_links, :storage_capacity, :vcloud_type, :vm_quota, :xmlns] }
+  end
+
+  context "with no uri" do
+
+    subject { Fog::Vcloud::Vdc.new() }
+
+    its(:href) { should be_nil }
+    its(:identity) { should be_nil }
+  end
+
+  context "as a collection member" do
+    subject { @vcloud.vdcs[0] }
+
+    its(:href)                  { should == URI.parse(@mock_vdc[:href]) }
+    its(:identity)              { should == URI.parse(@mock_vdc[:href]) }
+    its(:name)                  { should == @mock_vdc[:name] }
+    its(:other_links)           { should have(7).items }
+    its(:resource_entity_links) { should have(3).items }
+    its(:network_links)         { should have(2).items }
+
+    its(:cpu_capacity)          { should == Struct::VcloudXCapacity.new('Mhz',@mock_vdc[:cpu][:allocated], nil, @mock_vdc[:cpu][:allocated]) }
+    its(:memory_capacity)       { should == Struct::VcloudXCapacity.new('MB',@mock_vdc[:memory][:allocated], nil, @mock_vdc[:memory][:allocated]) }
+    its(:storage_capacity)      { should == Struct::VcloudXCapacity.new('MB',@mock_vdc[:storage][:allocated], nil, @mock_vdc[:storage][:allocated]) }
+
+    its(:vm_quota)              { should == 0 }
+    its(:nic_quota)             { should == 0 }
+    its(:network_quota)         { should == 0 }
+
+    its(:enabled)               { should == true }
+
+  end
+
+
+
+end

data/spec/vcloud/models/vdcs_spec.rb

@@ -0,0 +1 @@
+require 'spec_helper'