fog 0.3.16 → 0.3.17

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

@@ -18,6 +18,7 @@ module Fog
           #all_request lambda { |public_ips| public_ips.connection.get_public_ips(public_ips.href) }
 
           def all
+            check_href!(:message => "the Public Ips href of the Vdc you want to enumerate")
             if data = connection.get_public_ips(href).body[:PublicIPAddress]
               load(data)
             end

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

@@ -80,8 +80,10 @@ module Fog
           end
 
           def cpus
-            { :count => cpu_mess[:VirtualQuantity].to_i,
-              :units => cpu_mess[:AllocationUnits] }
+            if cpu_mess
+              { :count => cpu_mess[:VirtualQuantity].to_i,
+                :units => cpu_mess[:AllocationUnits] }
+            end
           end
 
           def cpus=(qty)
@@ -90,8 +92,10 @@ module Fog
           end
 
           def memory
-            { :amount => memory_mess[:VirtualQuantity].to_i,
-              :units => memory_mess[:AllocationUnits] }
+            if memory_mess
+              { :amount => memory_mess[:VirtualQuantity].to_i,
+                :units => memory_mess[:AllocationUnits] }
+            end
           end
 
           def memory=(amount)
@@ -112,7 +116,7 @@ module Fog
               @disk_change = :added
               load_unless_loaded!
               virtual_hardware[:Item] << { :ResourceType => '17',
-                                           :AddressOnParent => (disk_mess.map { |dm| dm[:AddressOnParent] }.sort.last.to_i + 1).to_s, 
+                                           :AddressOnParent => (disk_mess.map { |dm| dm[:AddressOnParent] }.sort.last.to_i + 1).to_s,
                                            :VirtualQuantity => size.to_s }
             end
             true
@@ -168,17 +172,25 @@ module Fog
 
           def memory_mess
             load_unless_loaded!
-            virtual_hardware[:Item].detect { |item| item[:ResourceType] == "4" }
+            if virtual_hardware && virtual_hardware[:Item]
+              virtual_hardware[:Item].detect { |item| item[:ResourceType] == "4" }
+            end
           end
 
           def cpu_mess
             load_unless_loaded!
-            virtual_hardware[:Item].detect { |item| item[:ResourceType] == "3" }
+            if virtual_hardware && virtual_hardware[:Item]
+              virtual_hardware[:Item].detect { |item| item[:ResourceType] == "3" }
+            end
           end
 
           def disk_mess
             load_unless_loaded!
-            virtual_hardware[:Item].select { |item| item[:ResourceType] == "17" }
+            if virtual_hardware && virtual_hardware[:Item]
+              virtual_hardware[:Item].select { |item| item[:ResourceType] == "17" }
+            else
+              []
+            end
           end
 
           def power_operation(op)

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

@@ -14,6 +14,7 @@ module Fog
           attribute :href, :aliases => :Href
 
           def all
+            check_href!(:parent => "Vdc")
             load(_vapps)
           end
 

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

@@ -12,6 +12,7 @@ module Fog
           attribute :href, :aliases => :Href
 
           def all
+            check_href!
             if data = connection.get_task_list(href).body[:Task]
               load(data)
             end

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

@@ -9,6 +9,8 @@ module Fog
 
           model Fog::Vcloud::Terremark::Ecloud::Vdc
 
+          undef_method :create
+
           def all
             data = connection.get_organization(organization_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
             data.each { |link| link.delete_if { |key, value| [:rel].include?(key) } }

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

@@ -124,14 +124,10 @@ module Fog
 
             internet_services_uri = ensure_unparsed(internet_services_uri)
 
-            if ip = ip_from_uri(internet_services_uri)
-              id = rand(1000)
-              new_service = service_data.merge!( { :href => Fog::Vcloud::Terremark::Ecloud::Mock.internet_service_href( { :id => id } ),
-                                                   :id => id.to_s,
-                                                   :timeout => 2,
-                                                   :nodes => [] } )
-              ip[:services] << new_service
-              xml = generate_internet_service_response( service_data, ip )
+            if public_ip_internet_service_collection = mock_data.public_ip_internet_service_collection_from_href(internet_services_uri)
+              new_public_ip_internet_service = MockPublicIpInternetService.new(service_data, public_ip_internet_service_collection)
+              public_ip_internet_service_collection.items << new_public_ip_internet_service
+              xml = generate_internet_service_response(new_public_ip_internet_service)
 
               mock_it 200, xml, {'Content-Type' => 'application/vnd.tmrk.ecloud.internetService+xml'}
             else

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

@@ -51,13 +51,10 @@ module Fog
 
           def add_node(nodes_uri, node_data)
             validate_node_data(node_data)
-            nodes_uri = ensure_unparsed(nodes_uri)
-            service_uri = nodes_uri.gsub('/nodeServices','')
-            ip, service = mock_ip_and_service_from_service_url(service_uri)
-            if ip and service
-              id = rand(1000)
-              service[:nodes] << node_data.merge!( :id => id.to_s, :href => Fog::Vcloud::Terremark::Ecloud::Mock.extension_url + "/nodeService/#{id}" )
-              mock_it 200, mock_node_service_response(node_data, ecloud_xmlns), { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }
+            if node_collection = mock_data.public_ip_internet_service_node_collection_from_href(ensure_unparsed(nodes_uri))
+              new_node = MockPublicIpInternetServiceNode.new(node_data, node_collection)
+              node_collection.items << new_node
+              mock_it 200, mock_node_service_response(new_node), { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }
             else
               mock_error 200, "401 Unauthorized"
             end

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

@@ -5,26 +5,26 @@ module Fog
         module Shared
           private
 
-          def generate_internet_service_response(service_data,ip_address_data)
+          def generate_internet_service_response(public_ip_internet_service)
             builder = Builder::XmlMarkup.new
             builder.InternetService(:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance",
                                     :xmlns => "urn:tmrk:eCloudExtensions-2.3") {
-              builder.Id(service_data[:id])
-              builder.Href(service_data[:href].to_s)
-              builder.Name(service_data[:name])
-              builder.Protocol(service_data[:protocol])
-              builder.Port(service_data[:port])
-              builder.Enabled(service_data[:enabled])
-              builder.Description(service_data[:description])
-              builder.Timeout(service_data[:timeout])
-              builder.RedirectURL(service_data[:redirect_url])
+              builder.Id(public_ip_internet_service.object_id)
+              builder.Href(public_ip_internet_service.href)
+              builder.Name(public_ip_internet_service.name)
+              builder.Protocol(public_ip_internet_service.protocol)
+              builder.Port(public_ip_internet_service.port)
+              builder.Enabled(public_ip_internet_service.enabled)
+              builder.Description(public_ip_internet_service.description)
+              builder.Timeout(public_ip_internet_service.timeout)
+              builder.RedirectURL(public_ip_internet_service.redirect_url)
               builder.PublicIpAddress {
-                builder.Id(ip_address_data[:id])
-                builder.Href(ip_address_data[:href].to_s)
-                builder.Name(ip_address_data[:name])
+                builder.Id(public_ip_internet_service._parent._parent.object_id)
+                builder.Href(public_ip_internet_service._parent._parent.href)
+                builder.Name(public_ip_internet_service._parent._parent.name)
               }
-              if monitor = service_data[:monitor]
-                generate_monitor_section(builder,monitor)
+              if monitor = public_ip_internet_service.monitor
+                generate_monitor_section(builder, public_ip_internet_service.monitor)
               end
             }
           end
@@ -79,11 +79,9 @@ module Fog
 
             xml = nil
 
-            if ip = ip_from_uri(ip_address_data[:href])
-              if service = ip[:services].detect { |service| service[:id] == internet_service_uri.split('/')[-1] }
-                ip[:services][ip[:services].index(service)] = service_data
-                xml = generate_internet_service_response(service_data, ip)
-              end
+            if public_ip_internet_service = mock_data.public_ip_internet_service_from_href(internet_service_uri)
+              public_ip_internet_service.update(service_data.reject {|k, v| [:id, :href].include?(k) })
+              xml = generate_internet_service_response(public_ip_internet_service)
             end
 
             if xml

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

@@ -39,15 +39,14 @@ module Fog
           include Shared
 
           def configure_node(node_uri, node_data)
-            node_uri = ensure_unparsed(node_uri)
-
             validate_node_data(node_data, true)
 
-            if node = mock_node_from_url(node_uri)
-              node[:name] = node_data[:name]
-              node[:enabled] = node_data[:enabled]
-              node[:description] = node_data[:description]
-              mock_it 200, mock_node_service_response(node, ecloud_xmlns), { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }
+            if node = mock_data.public_ip_internet_service_node_from_href(ensure_unparsed(node_uri))
+              node.update(node_data)
+              #if node_data[:enabled] 
+              #  node.enabled = (node_data[:enabled] == "true") ? true : false
+              #end
+              mock_it 200, mock_node_service_response(node), { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }
             else
               mock_error 200, "401 Unauthorized"
             end

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

@@ -2,7 +2,19 @@ module Fog
   class Vcloud
     module Terremark
       class Ecloud
+        module Shared
+          private
+
+          def validate_vapp_data(vapp_data)
+            valid_opts = [:name, :cpus, :memory, :disks]
+            unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+              raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
+            end
+          end
+        end
+
         class Real
+          include Shared
 
           def generate_configure_vapp_request(vapp_uri, vapp_data)
             rasd_xmlns = { "xmlns" => "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" }
@@ -42,7 +54,7 @@ module Fog
 
             #puts xml.root.to_s
             xml.root.to_s
-            
+
             #builder = Builder::XmlMarkup.new
             #builder.Vapp(:href => vapp_uri.to_s,
             #             :type => 'application/vnd.vmware.vcloud.vApp+xml',
@@ -82,13 +94,6 @@ module Fog
             #}
           end
 
-          def validate_vapp_data(vapp_data)
-            valid_opts = [:name, :cpus, :memory, :disks]
-            unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
-              raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
-            end
-          end
-
           def configure_vapp(vapp_uri, vapp_data)
             validate_vapp_data(vapp_data)
 
@@ -105,8 +110,34 @@ module Fog
         end
 
         class Mock
+          include Shared
+
           def configure_vapp(vapp_uri, vapp_data)
-            Fog::Mock.not_implemented
+            validate_vapp_data(vapp_data)
+
+            if vapp = mock_data.virtual_machine_from_href(vapp_uri)
+              vapp_data.each do |key, value|
+                case key
+                when :cpus, :memory
+                  vapp[key] = value
+                when :disks
+                  addresses_to_delete = vapp.disks.map {|d| d.address } - value.map {|d| d[:number] }
+                  addresses_to_delete.each do |address_to_delete|
+                    vapp.disks.delete(vapp.disks.at_address(address_to_delete))
+                  end
+
+                  current_addresses = vapp.disks.map {|d| d.address }
+                  disks_to_add = value.find_all {|d| !current_addresses.include?(d[:number]) }
+                  disks_to_add.each do |disk_to_add|
+                    vapp.disks << MockVirtualMachineDisk.new(:size => disk_to_add[:size] / 1024, :address => disk_to_add[:number])
+                  end
+                end
+              end
+
+              mock_it 200, '', { "Location" => mock_data.base_url + "/some_tasks/1234" }
+            else
+              mock_error 200, "401 Unauthorized"
+            end
           end
         end
       end

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

@@ -8,18 +8,10 @@ module Fog
         end
 
         class Mock
-
           def delete_internet_service(service_uri)
+            if public_ip_internet_service = mock_data.public_ip_internet_service_from_href(service_uri)
+              public_ip_internet_service._parent.items.delete(public_ip_internet_service)
 
-            deleted = false
-            if ip = mock_ip_from_service_url(service_uri)
-              if service = ip[:services].detect { |service| service[:href] == service_uri }
-                ip[:services].delete(service)
-                deleted = true
-              end
-            end
-
-            if deleted
               mock_it 200, '', { }
             else
               mock_error 200, "401 Unauthorized"

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

@@ -10,12 +10,8 @@ module Fog
         class Mock
 
           def delete_node(node_uri)
-            node_uri = ensure_unparsed(node_uri)
-
-            node = mock_node_from_url(node_uri)
-            service = mock_service_from_node_url(node_uri)
-            if node and service
-              service[:nodes].delete(node)
+            if node = mock_data.public_ip_internet_service_node_from_href(ensure_unparsed(node_uri))
+              node._parent.items.delete(node)
               mock_it 200, '', {}
             else
               mock_error 200, "401 Unauthorized"

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

@@ -9,7 +9,19 @@ module Fog
 
         class Mock
           def delete_vapp(vapp_uri)
-            Fog::Mock.not_implemented
+            if virtual_machine = mock_data.virtual_machine_from_href(vapp_uri)
+              vdc = virtual_machine._parent
+
+              if vdc.internet_service_collection.items.detect {|is| is.node_collection.items.any? {|isn| isn.ip_address == virtual_machine.ip } } ||
+                  virtual_machine.status != 2
+                mock_it 202, '', {}
+              else
+                vdc.virtual_machines.delete(virtual_machine)
+                mock_it 202, '', { "Location" => mock_data.base_url + "/some_tasks/1234" }
+              end
+            else
+              mock_error 200, "401 Unauthorized"
+            end
           end
         end
       end

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

@@ -12,20 +12,20 @@ module Fog
             catalog_uri = ensure_unparsed(catalog_uri)
             xml = nil
 
-            if vdc = vdc_from_uri(catalog_uri)
+            if catalog = mock_data.catalog_from_href(catalog_uri)
               builder = Builder::XmlMarkup.new
 
               xml = builder.Catalog(xmlns.merge(
                                                 :type => "application/vnd.vmware.vcloud.catalog+xml",
-                                                :href => catalog_uri,
-                                                :name => vdc[:catalog][:name]
+                                                :href => catalog.href,
+                                                :name => catalog.name
                                     )) do |xml|
                 xml.CatalogItems do |xml|
-                  vdc[:catalog][:items].each do |catalog_item|
+                  catalog.items.each do |catalog_item|
                     xml.CatalogItem(
                                     :type => "application/vnd.vmware.vcloud.catalogItem+xml",
-                                    :href => "#{self.class.base_url}/catalogItem/#{catalog_item[:id]}-#{vdc[:id]}",
-                                    :name => catalog_item[:name]
+                                    :href => catalog_item.href,
+                                    :name => catalog_item.name
                                     )
                   end
                 end

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

@@ -15,22 +15,21 @@ module Fog
           #
 
           def get_catalog_item(catalog_item_uri)
-            if catalog_item_and_vdc = catalog_item_and_vdc_from_catalog_item_uri(catalog_item_uri)
-              catalog_item, vdc = catalog_item_and_vdc
+            if catalog_item = mock_data.catalog_item_from_href(catalog_item_uri)
               builder = Builder::XmlMarkup.new
 
-              xml = builder.CatalogItem(xmlns.merge(:href => catalog_item_uri, :name => catalog_item[:name])) do
+              xml = builder.CatalogItem(xmlns.merge(:href => catalog_item.href, :name => catalog_item.name)) do
                 builder.Link(
                              :rel => "down",
-                             :href => Fog::Vcloud::Terremark::Ecloud::Mock.catalog_item_customization_href(:id => catalog_item[:id]),
+                             :href => catalog_item.customization.href,
                              :type => "application/vnd.tmrk.ecloud.catalogItemCustomizationParameters+xml",
-                             :name => "Customization Options"
+                             :name => catalog_item.customization.name
                              )
 
                 builder.Entity(
-                               :href => Fog::Vcloud::Terremark::Ecloud::Mock.vapp_template_href(:id => catalog_item[:id]),
+                               :href => catalog_item.vapp_template.href,
                                :type => "application/vnd.vmware.vcloud.vAppTemplate+xml",
-                               :name => catalog_item[:name]
+                               :name => catalog_item.vapp_template.name
                                )
 
                 builder.Property(0, :key => "LicensingCost")

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

@@ -8,50 +8,23 @@ module Fog
         end
 
         class Mock
-
           #
           #Based off of:
           #http://support.theenterprisecloud.com/kb/default.asp?id=580&Lang=1&SID=
           #http://support.theenterprisecloud.com/kb/default.asp?id=560&Lang=1&SID=
           #
           #
-          def self.internet_services_for_ip(xml,ip)
-            ip[:services].each do |service|
-              xml.InternetService {
-                xml.Id(service[:id])
-                xml.Href(Fog::Vcloud::Terremark::Ecloud::Mock.internet_service_href(service))
-                xml.Name(service[:name])
-                xml.PublicIpAddress {
-                  xml.Id(ip[:id])
-                  xml.Href(Fog::Vcloud::Terremark::Ecloud::Mock.public_ip_href(ip))
-                  xml.Name(ip[:name])
-                }
-                xml.Port(service[:port])
-                xml.Protocol(service[:protocol])
-                xml.Enabled(service[:enabled])
-                xml.Timeout(service[:timeout])
-                xml.Description(service[:description])
-                xml.RedirectURL(service[:redirect_url])
-                xml.Monitor
-              }
-            end
-          end
 
           def get_internet_services(internet_services_uri)
             internet_services_uri = ensure_unparsed(internet_services_uri)
             xml = nil
-            builder = Builder::XmlMarkup.new
-            if vdc = vdc_from_uri(internet_services_uri)
-              xml = builder.InternetServices( :xmlns => "urn:tmrk:eCloudExtensions-2.3",:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance" ) { |xml|
-                vdc[:public_ips].each do |ip|
-                  Fog::Vcloud::Terremark::Ecloud::Mock.internet_services_for_ip(xml,ip)
-                end
-              }
-            elsif ip = ip_from_uri(internet_services_uri)
-              xml = builder.InternetServices( :xmlns => "urn:tmrk:eCloudExtensions-2.3",:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance" ) { |xml|
-                Fog::Vcloud::Terremark::Ecloud::Mock.internet_services_for_ip(xml,ip)
-              }
+
+            if vdc_internet_service_collection = mock_data.vdc_internet_service_collection_from_href(internet_services_uri)
+              xml = generate_internet_services(vdc_internet_service_collection.items)
+            elsif public_ip_internet_service_collection = mock_data.public_ip_internet_service_collection_from_href(internet_services_uri)
+              xml = generate_internet_services(public_ip_internet_service_collection.items)
             end
+
             if xml
               mock_it 200,
                 xml, { 'Content-Type' => 'application/vnd.tmrk.ecloud.internetServicesList+xml' }
@@ -59,6 +32,34 @@ module Fog
               mock_error 200, "401 Unauthorized"
             end
           end
+
+          private
+
+          def generate_internet_services(services)
+            builder = Builder::XmlMarkup.new
+
+            builder.InternetServices(:xmlns => "urn:tmrk:eCloudExtensions-2.3",:"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance") {|xml|
+              services.each do |service|
+                xml.InternetService {
+                  xml.Id service.object_id
+                  xml.Href service.href
+                  xml.Name service.name
+                  xml.PublicIpAddress {
+                    xml.Id service._parent._parent.object_id
+                    xml.Href service._parent._parent.href
+                    xml.Name service._parent._parent.name
+                  }
+                  xml.Port service.port
+                  xml.Protocol service.protocol
+                  xml.Enabled service.enabled
+                  xml.Timeout service.timeout
+                  xml.Description service.description
+                  xml.RedirectURL service.redirect_url
+                  xml.Monitor
+                }
+              end
+            }
+          end
         end
       end
     end