fog 0.2.0 → 0.2.1

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

@@ -0,0 +1,44 @@
+#
+# AFAICT this is basically undocumented ATM - 6/18/2010 - freeformz
+#
+
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :get_network_ip
+        end
+
+        module 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' }
+            else
+              mock_error 200, "401 Unauthorized"
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -1,38 +1,37 @@
+#
+# AFAICT - This is basically undocumented - 6/18/2010 - freeformz
+#
+
 module Fog
   module Vcloud
     module Terremark
       module Ecloud
-        module Real
-
-          def get_network_ips(network_ips_uri)
-            request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Vcloud::Terremark::Ecloud::NetworkIps.new,
-              :uri      => network_ips_uri
-            )
-          end
 
+        module Real
+          basic_request :get_network_ips
         end
 
         module 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.to_s.gsub(%r:/ips$:,'') }
+            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 Fog::Parsers::Vcloud::Terremark::Ecloud::NetworkIps.new, 200,
+              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])
                     }
                   end
                 },

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :get_node
+        end
+
+        module Mock
+          def get_node(node_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :get_nodes
+        end
+
+        module Mock
+          def get_nodes(nodes_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,20 +4,7 @@ module Fog
       module Ecloud
 
         module Real
-
-          def get_public_ip(public_ip_uri)
-            opts = {
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Vcloud::Terremark::Ecloud::GetPublicIp.new,
-              :uri      => public_ip_uri
-            }
-            if self.class == Fog::Terremark::Ecloud::Real
-              opts[:path] = "extensions/publicIp/#{public_ip_id}"
-            end
-            request(opts)
-          end
-
+          basic_request :get_public_ip
         end
 
         module Mock
@@ -27,16 +14,15 @@ module Fog
           #
 
           def get_public_ip(public_ip_uri)
-            ip_id = public_ip_uri.to_s.split('/')[-1]
-            if ip = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.map { |vdc| vdc[:public_ips] }.flatten.detect { |ip| ip[:id].to_s == ip_id }
+            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 }
               xml = Builder::XmlMarkup.new
-              mock_it(Fog::Parsers::Vcloud::Terremark::Ecloud::GetPublicIp.new, 200,
+              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("#{Fog::Vcloud::Terremark::Ecloud::Mock.base_url}/extensions/publicIp/#{ip[:id]}")
+                  xml.Href(ip[:href])
                   xml.Name(ip[:name])
                 }, { 'Content-Type' => 'application/vnd.tmrk.ecloud.publicIp+xml' }
-              )
             else
               mock_error 200, "401 Unauthorized"
             end

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

@@ -4,15 +4,7 @@ module Fog
       module Ecloud
 
         module Real
-
-          def get_public_ips(public_ips_uri)
-            request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Vcloud::Terremark::Ecloud::GetPublicIps.new,
-              :uri      => public_ips_uri
-            )
-          end
+          basic_request :get_public_ips
         end
 
         module Mock
@@ -22,14 +14,15 @@ module Fog
           #http://support.theenterprisecloud.com/kb/default.asp?id=577&Lang=1&SID=
           #
           def get_public_ips(public_ips_uri)
-            if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:href].split('/').last == public_ips_uri.to_s.split('/')[-2] }
+            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] }
               xml = Builder::XmlMarkup.new
-              mock_it Fog::Parsers::Vcloud::Terremark::Ecloud::GetPublicIps.new, 200,
+              mock_it 200,
                 xml.PublicIPAddresses {
                   vdc[:public_ips].each do |ip|
                     xml.PublicIPAddress {
                       xml.Id(ip[:id])
-                      xml.Href("#{Fog::Vcloud::Terremark::Ecloud::Mock.base_url}/extensions/publicIp/#{ip[:id]}")
+                      xml.Href(ip[:href])
                       xml.Name(ip[:name])
                     }
                   end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :get_task
+        end
+
+        module Mock
+          def get_task(task__uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :get_task_list
+        end
+
+        module Mock
+          def get_task_list(task_list_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :get_vapp
+        end
+
+        module Mock
+          def get_vapp(vapp_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,16 +4,7 @@ module Fog
       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
+          # Handled by the main Vcloud get_vdc
         end
 
         module Mock
@@ -22,24 +13,25 @@ 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| URI.parse(vdc[:href]) == vdc_uri }
+            vdc_uri = ensure_unparsed(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,
+              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[:href].gsub('/vdc','/extensions/vdc') + "/publicIps",
+                           :href => vdc[:extension_href] + "/publicIps",
                            :type => "application/vnd.tmrk.ecloud.publicIpsList+xml",
                            :name => "Public IPs")
                   xml.Link(:rel => "down",
-                           :href => vdc[:href] + "/internetServices",
+                           :href => vdc[:extension_href] + "/internetServices",
                            :type => "application/vnd.tmrk.ecloud.internetServicesList+xml",
                            :name => "Internet Services")
                   xml.Link(:rel => "down",
-                           :href => vdc[:href].sub('/vdc','/extensions/vdc') + "/firewallAcls",
+                           :href => vdc[:extension_href] + "/firewallAcls",
                            :type => "application/vnd.tmrk.ecloud.firewallAclsList+xml",
                            :name => "Firewall Access List")
                   xml.Description("")

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :power_off, 202, 'POST'
+        end
+
+        module Mock
+          def power_off(off_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :power_on, 202, 'POST'
+        end
+
+        module Mock
+          def power_on(on_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :power_reset, 202, 'POST'
+        end
+
+        module Mock
+          def power_reset(reset_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Real
+          basic_request :power_shutdown, 204, 'POST'
+        end
+
+        module Mock
+          def power_shutdown(shutdown_uri)
+            Fog::Mock.not_implemented
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,26 +2,12 @@ module Fog
   module Vcloud
     module Terremark
       module Vcloud
+        extend Fog::Vcloud::Extension
 
-        module Versions
-          SUPPORTED = ["v0.8"]
-        end
+        versions "v0.8"
 
-        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
+        request_path 'fog/vcloud/terremark/vcloud/requests'
+        request :get_vdc
 
         private
 

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

@@ -4,16 +4,7 @@ module Fog
       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
+          # Handled by the main Vcloud get_vdc
         end
 
         module Mock
@@ -22,9 +13,10 @@ 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| URI.parse(vdc[:href]) == vdc_uri }
+            vdc_uri = ensure_unparsed(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,
+              mock_it 200,
                 xml.Vdc(xmlns.merge(:href => vdc[:href], :name => vdc[:name])) {
                   xml.Link(:rel => "down",
                            :href => vdc[:href] + "/catalog",