fog 0.3.16 → 0.3.17

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

@@ -8,34 +8,33 @@ module Fog
         end
 
         class Mock
+          #
+          # Based off of:
+          # http://support.theenterprisecloud.com/kb/default.asp?id=546&Lang=1&SID=
+          #
 
           def get_network(network_uri)
-            #
-            # Based off of:
-            # http://support.theenterprisecloud.com/kb/default.asp?id=546&Lang=1&SID=
-            #
             network_uri = ensure_unparsed(network_uri)
-            type = "application/vnd.vmware.vcloud.network+xml"
-            response = Excon::Response.new
-            if network = mock_data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:href] == network_uri }
-              xml = Builder::XmlMarkup.new
-              mock_it 200,
-                xml.Network(xmlns.merge(:href => network[:href], :name => network[:name], :type => type)) {
-                  xml.Link( :rel => "down", :href => network[:href] + "/ips", :type => "application/xml", :name => "IP Addresses" )
-                  xml.Link( :rel => "down", :href => network[:extension_href], :type => "application/xml", :name => network[:name] )
-                  xml.Configuration {
-                    xml.Gateway(network[:gateway])
-                    xml.Netmask(network[:netmask])
+
+            if network = mock_data.network_from_href(network_uri)
+              builder = Builder::XmlMarkup.new
+              xml = builder.Network(xmlns.merge(:href => network.href, :name => network.name, :type => "application/vnd.vmware.vcloud.network+xml")) {
+                builder.Link(:rel => "down", :href => network.ip_collection.href, :type => "application/xml", :name => network.ip_collection.name)
+                builder.Link(:rel => "down", :href => network.extensions.href, :type => "application/xml", :name => network.name)
+                builder.Configuration {
+                  builder.Gateway(network.gateway)
+                  builder.Netmask(network.netmask)
+                }
+                if network.features
+                  builder.Features {
+                    network.features.each do |feature|
+                      builder.tag!(feature[:type], feature[:value])
+                    end
                   }
-                  if network[:features]
-                    xml.Features {
-                      network[:features].each do |feature|
-                        eval "xml.#{feature[:type].to_sym}('#{feature[:value]}')"
-                      end
-                    }
-                  end
-                },
-                { 'Content-Type' => type }
+                end
+              }
+
+              mock_it 200, xml, { "Content-Type" => "application/vnd.vmware.vcloud.network+xml" }
             else
               mock_error 200, "401 Unauthorized"
             end

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

@@ -9,22 +9,19 @@ module Fog
 
         class Mock
 
-          def get_network_extensions(network_uri)
-            network_uri = ensure_unparsed(network_uri)
-            type = "application/vnd.vmware.vcloud.network+xml"
-            response = Excon::Response.new
-            if network = mock_data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:extension_href] == network_uri }
+          def get_network_extensions(network_extension_uri)
+            if network_extension = mock_data.network_extension_from_href(ensure_unparsed(network_extension_uri))
               xml = Builder::XmlMarkup.new
               mock_it 200,
                 xml.Network(:xmlns => "urn:tmrk:eCloudExtensions-2.3", :"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance") {
-                  xml.Address(network[:name].split("/")[0])
-                  xml.RnatAddress(network[:rnat])
-                  xml.Href(network[:extension_href])
-                  xml.Id(network[:id])
-                  xml.Name(network[:name])
-                  xml.GatewayAddress(network[:gateway])
-                  xml.BroadcastAddress(IPAddr.new(network[:subnet]).to_range.last.to_s)
-                }, { 'Content-Type' => type }
+                  xml.Address network_extension.address
+                  xml.RnatAddress network_extension.rnat
+                  xml.Href network_extension.href
+                  xml.Id network_extension.object_id
+                  xml.Name network_extension.name
+                  xml.GatewayAddress network_extension.gateway
+                  xml.BroadcastAddress network_extension.broadcast
+                }, { 'Content-Type' => "application/vnd.tmrk.ecloud.network+xml" }
             else
               mock_error 200, "401 Unauthorized"
             end

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

@@ -13,25 +13,21 @@ module Fog
 
         class Mock
 
-          def get_network_ip(ip_uri)
-            response = Excon::Response.new
-            ip_id = ip_uri.split("/").last
-            if network = mock_data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| IPAddr.new(network[:subnet]).to_range.map { |ip| ip.to_s.gsub('.','') }.include?(ip_id) }
-              ip = IPAddr.new(network[:subnet]).to_range.detect { |ip| ip.to_s.gsub('.','') == ip_id }
-              xml = Builder::XmlMarkup.new
-              mock_it 200,
-                xml.IpAddress(ecloud_xmlns) {
-                  xml.Id( ip_id )
-                  xml.Href( ip_uri.to_s )
-                  xml.Name( ip.to_s )
-                  if network[:ips].has_key?(ip.to_s)
-                    xml.Status( "Assigned" )
-                    xml.Server( network[:ips][ip.to_s] )
-                  else
-                    xml.Status( "Available" )
-                  end
-                },
-                { 'Content-Type' => 'application/vnd.tmrk.ecloud.ip+xml' }
+          def get_network_ip(network_ip_uri)
+            if network_ip = mock_data.network_ip_from_href(network_ip_uri)
+              builder = Builder::XmlMarkup.new
+              xml = builder.IpAddress(ecloud_xmlns) do
+                builder.Id network_ip.object_id
+                builder.Href network_ip.href
+                builder.Name network_ip.name
+
+                builder.Status network_ip.status
+                if network_ip.used_by
+                  builder.Server network_ip.used_by
+                end
+              end
+
+              mock_it 200, xml, { 'Content-Type' => 'application/vnd.tmrk.ecloud.ip+xml' }
             else
               mock_error 200, "401 Unauthorized"
             end

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

@@ -12,35 +12,33 @@ module Fog
         end
 
         class Mock
-          require 'ipaddr'
 
           def get_network_ips(network_ips_uri)
             network_ips_uri = ensure_unparsed(network_ips_uri)
-            response = Excon::Response.new
-            if network = mock_data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:href] == network_ips_uri.gsub(%r:/ips$:,'') }
-              xml = Builder::XmlMarkup.new
-              mock_it 200,
-                xml.IpAddresses {
-                  IPAddr.new(network[:name]).to_range.to_a[3..-2].each do |ip|
-                    xml.IpAddress {
-                      xml.Name(ip.to_s)
-                      xml.Href("#{Fog::Vcloud::Terremark::Ecloud::Mock.extension_url}/ip/#{ip.to_s.gsub('.','')}")
-                      if network[:ips].has_key?(ip.to_s)
-                        xml.Status("Assigned")
-                        xml.Server(network[:ips][ip.to_s])
-                      else
-                        xml.Status("Available")
-                      end
-                      xml.RnatAddress(network[:rnat])
-                    }
+
+            if network_ip_collection = mock_data.network_ip_collection_from_href(network_ips_uri)
+              builder = Builder::XmlMarkup.new
+              xml = builder.IpAddresses do
+                network_ip_collection.ordered_ips.each do |network_ip|
+                  builder.IpAddress do
+                    builder.Name network_ip.name
+                    builder.Href network_ip.href
+
+                    if network_ip.used_by
+                      builder.Status("Assigned")
+                      builder.Server(network_ip.used_by.name)
+                    else
+                      builder.Status("Available")
+                    end
+                    builder.RnatAddress(network_ip.rnat)
                   end
-                },
-                { 'Content-Type' => 'application/vnd.tmrk.ecloud.ipAddressesList+xml' }
+                end
+              end
+
+              mock_it 200, xml, { 'Content-Type' => 'application/vnd.tmrk.ecloud.ipAddressesList+xml' }
             else
               mock_error 200, "401 Unauthorized"
             end
-            
-
           end
 
         end

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

@@ -8,32 +8,29 @@ module Fog
         end
 
         class Mock
-
           #
           # Based on http://support.theenterprisecloud.com/kb/default.asp?id=641&Lang=1&SID=
           #
-          #
-          #
-          def mock_node_service_response(node, xmlns)
+
+          def mock_node_service_response(node)
             xml = Builder::XmlMarkup.new
-            xml.NodeService(xmlns) {
-              xml.Id(node[:id])
-              xml.Href(node[:href])
-              xml.Name(node[:name])
-              xml.IpAddress(node[:ip_address])
-              xml.Port(node[:port])
-              xml.Enabled(node[:enabled])
-              xml.Description(node[:description])
+            xml.NodeService(ecloud_xmlns) {
+              xml.Id(node.object_id)
+              xml.Href(node.href)
+              xml.Name(node.name)
+              xml.IpAddress(node.ip_address)
+              xml.Port(node.port)
+              xml.Enabled(node.enabled)
+              xml.Description(node.description)
             }
           end
 
           def get_node(node_uri)
-
             node_uri = ensure_unparsed(node_uri)
 
-            if node = mock_node_from_url(node_uri)
+            if public_ip_internet_service_node = mock_data.public_ip_internet_service_node_from_href(node_uri)
               xml = Builder::XmlMarkup.new
-              mock_it 200, mock_node_service_response(node, ecloud_xmlns), { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }
+              mock_it 200, mock_node_service_response(public_ip_internet_service_node), { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }
             else
               mock_error 200, "401 Unauthorized"
             end

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

@@ -8,28 +8,27 @@ module Fog
         end
 
         class Mock
-
           #
           # Based off of:
           # http://support.theenterprisecloud.com/kb/default.asp?id=637&Lang=1&SID=
           #
+
           def get_nodes(nodes_uri)
             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
+
+            if public_ip_internet_service_node_collection = mock_data.public_ip_internet_service_node_collection_from_href(nodes_uri)
               xml = Builder::XmlMarkup.new
               mock_it 200,
                 xml.NodeServices(ecloud_xmlns) {
-                  service[:nodes].each do |node|
+                  public_ip_internet_service_node_collection.items.each do |node|
                     xml.NodeService {
-                      xml.Id(node[:id])
-                      xml.Href(node[:href])
-                      xml.Name(node[:name])
-                      xml.IpAddress(node[:ip_address])
-                      xml.Port(node[:port])
-                      xml.Enabled(node[:enabled])
-                      xml.Description(node[:description])
+                      xml.Id node.object_id
+                      xml.Href node.href
+                      xml.Name node.name
+                      xml.IpAddress node.ip_address
+                      xml.Port node.port
+                      xml.Enabled node.enabled
+                      xml.Description node.description
                     }
                   end
                 }, { 'Content-Type' => 'application/vnd.tmrk.ecloud.nodeService+xml' }

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

@@ -15,13 +15,14 @@ module Fog
 
           def get_public_ip(public_ip_uri)
             public_ip_uri = ensure_unparsed(public_ip_uri)
-            if ip = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.map { |vdc| vdc[:public_ips] }.flatten.detect { |ip| ip[:href] == public_ip_uri }
+
+            if public_ip = mock_data.public_ip_from_href(public_ip_uri)
               xml = Builder::XmlMarkup.new
               mock_it 200,
                 xml.PublicIp(:xmlns => "urn:tmrk:eCloudExtensions-2.0", :"xmlns:i" => "http://www.w3.org/2001/XMLSchema-instance") {
-                  xml.Id(ip[:id])
-                  xml.Href(ip[:href])
-                  xml.Name(ip[:name])
+                  xml.Id public_ip.object_id
+                  xml.Href public_ip.href
+                  xml.Name public_ip.name
                 }, { 'Content-Type' => 'application/vnd.tmrk.ecloud.publicIp+xml' }
             else
               mock_error 200, "401 Unauthorized"

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

@@ -8,22 +8,23 @@ module Fog
         end
 
         class Mock
-
           #
-          #Based off of:
-          #http://support.theenterprisecloud.com/kb/default.asp?id=577&Lang=1&SID=
+          # Based off of:
+          # http://support.theenterprisecloud.com/kb/default.asp?id=577&Lang=1&SID=
           #
+
           def get_public_ips(public_ips_uri)
             public_ips_uri = ensure_unparsed(public_ips_uri)
-            if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:href].split('/').last == public_ips_uri.split('/')[-2] }
+
+            if public_ip_collection = mock_data.public_ip_collection_from_href(public_ips_uri)
               xml = Builder::XmlMarkup.new
               mock_it 200,
                 xml.PublicIPAddresses {
-                  vdc[:public_ips].each do |ip|
+                  public_ip_collection.items.each do |ip|
                     xml.PublicIPAddress {
-                      xml.Id(ip[:id])
-                      xml.Href(ip[:href])
-                      xml.Name(ip[:name])
+                      xml.Id ip.object_id
+                      xml.Href ip.href
+                      xml.Name ip.name
                     }
                   end
                 }, { 'Content-Type' => 'application/vnd.tmrk.ecloud.publicIpsList+xml'}

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

@@ -8,11 +8,23 @@ module Fog
         end
 
         class Mock
+          def return_vapp_as_creating!(name)
+            vapps_to_return_as_creating[name] = true
+          end
+
+          def vapps_to_return_as_creating
+            @vapps_to_return_as_creating ||= {}
+          end
+
           def get_vapp(vapp_uri)
             xml = nil
 
-            if vapp_and_vdc = vapp_and_vdc_from_vapp_uri(vapp_uri)
-              xml = generate_get_vapp_response(*vapp_and_vdc)
+            if vapp = mock_data.virtual_machine_from_href(vapp_uri)
+              if vapps_to_return_as_creating[vapp.name]
+                xml = generate_instantiate_vapp_template_response(vapp)
+              else
+                xml = generate_get_vapp_response(vapp)
+              end
             end
 
             if xml
@@ -24,19 +36,20 @@ module Fog
 
           private
 
-          def generate_get_vapp_response(vapp, vdc)
+          def generate_get_vapp_response(vapp)
             builder = Builder::XmlMarkup.new
             builder.VApp(xmlns.merge(
-                                     :href => vapp[:href],
+                                     :href => vapp.href,
                                      :type => "application/vnd.vmware.vcloud.vApp+xml",
-                                     :name => vapp[:name],
-                                     :status => vapp[:status] || 4
+                                     :name => vapp.name,
+                                     :status => vapp.status,
+                                     :size => vapp.size
                                      )) do
-              builder.Link(:rel => "up", :href => vdc[:href], :type => "application/vnd.vmware.vcloud.vdc+xml")
+              builder.Link(:rel => "up", :href => vapp._parent.href, :type => "application/vnd.vmware.vcloud.vdc+xml")
 
               builder.NetworkConnectionSection(:xmlns => "http://schemas.dmtf.org/ovf/envelope/1") do
                 builder.NetworkConnection(:Network => "Internal", :xmlns => "http://www.vmware.com/vcloud/v0.8") do
-                  builder.IpAddress vapp[:ip]
+                  builder.IpAddress vapp.ip
                 end
               end
 
@@ -53,12 +66,12 @@ module Fog
                 builder.System
                 builder.Item do
                   # CPUs
-                  builder.VirtualQuantity vapp[:cpus] || 1
+                  builder.VirtualQuantity vapp.cpus
                   builder.ResourceType 3
                 end
                 builder.Item do
                   # memory
-                  builder.VirtualQuantity vapp[:memory] || 1024
+                  builder.VirtualQuantity vapp.memory
                   builder.ResourceType 4
                 end
                 builder.Item do
@@ -67,13 +80,16 @@ module Fog
                   builder.ResourceType 6
                   builder.InstanceId 3
                 end
-                builder.Item do
-                  # Hard Disk 1
-                  builder.Parent 3
-                  builder.VirtualQuantity vapp[:disks].first[:size] * 1024 # MB
-                  builder.HostResource vapp[:disks].first[:size] * 1024 # MB
-                  builder.ResourceType 17
-                  builder.AddressOnParent 0
+
+                # Hard Disks
+                vapp.disks.each do |disk|
+                  builder.Item do
+                    builder.Parent 3
+                    builder.VirtualQuantity disk.vcloud_size
+                    builder.HostResource disk.vcloud_size
+                    builder.ResourceType 17
+                    builder.AddressOnParent disk.address
+                  end
                 end
               end
             end

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

@@ -14,65 +14,66 @@ module Fog
 
           def get_vdc(vdc_uri)
             vdc_uri = ensure_unparsed(vdc_uri)
-            if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:href] == vdc_uri }
+
+            if vdc = mock_data.vdc_from_href(vdc_uri)
               xml = Builder::XmlMarkup.new
               mock_it 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[:extension_href] + "/publicIps",
-                           :type => "application/vnd.tmrk.ecloud.publicIpsList+xml",
-                           :name => "Public IPs")
-                  xml.Link(:rel => "down",
-                           :href => vdc[:extension_href] + "/internetServices",
-                           :type => "application/vnd.tmrk.ecloud.internetServicesList+xml",
-                           :name => "Internet Services")
-                  xml.Link(:rel => "down",
-                           :href => vdc[:extension_href] + "/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.Vdc(xmlns.merge(:href => vdc.href, :name => vdc.name)) {
+                xml.Link(:rel => "down",
+                         :href => vdc.catalog.href,
+                         :type => "application/vnd.vmware.vcloud.catalog+xml",
+                         :name => vdc.catalog.name)
+                xml.Link(:rel => "down",
+                         :href => vdc.public_ip_collection.href,
+                         :type => "application/vnd.tmrk.ecloud.publicIpsList+xml",
+                         :name => vdc.public_ip_collection.name)
+                xml.Link(:rel => "down",
+                         :href => vdc.internet_service_collection.href,
+                         :type => "application/vnd.tmrk.ecloud.internetServicesList+xml",
+                         :name => vdc.internet_service_collection.name)
+                xml.Link(:rel => "down",
+                         :href => vdc.firewall_acls.href,
+                         :type => "application/vnd.tmrk.ecloud.firewallAclsList+xml",
+                         :name => vdc.firewall_acls.name)
+                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.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.Memory {
+                    xml.Units("bytes * 2^20")
+                    xml.Allocated(vdc.memory_allocated)
                   }
-                  xml.ResourceEntities {
-                    vdc[:vms].each do |vm|
-                      xml.ResourceEntity(:href => vm[:href],
-                                         :type => "application/vnd.vmware.vcloud.vApp+xml",
-                                         :name => vm[:name])
-                    end
+                  xml.DeployedVmsQuota {
+                    xml.Limit("-1")
+                    xml.Used("-1")
                   }
-                  xml.AvailableNetworks {
-                    vdc[:networks].each do |network|
-                      xml.Network(:href => network[:href],
-                                  :type => "application/vnd.vmware.vcloud.network+xml",
-                                  :name => network[:name])
-                    end
+                  xml.InstantiatedVmsQuota {
+                    xml.Limit("-1")
+                    xml.Used("-1")
                   }
-                }, { 'Content-Type' => 'application/vnd.vmware.vcloud.vdc+xml'}
+                }
+                xml.ResourceEntities {
+                  vdc.virtual_machines.each do |virtual_machine|
+                    xml.ResourceEntity(:href => virtual_machine.href,
+                                       :type => "application/vnd.vmware.vcloud.vApp+xml",
+                                       :name => virtual_machine.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