fog-terremark 0.0.4 → 0.1.0

data/lib/fog/compute/terremark/requests/get_network_ips.rb

@@ -13,10 +13,10 @@ module Fog
         #   FIXME
         def get_network_ips(network_id)
           opts =  {
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetNetworkIps.new,
-              :path     => "network/#{network_id}/ipAddresses"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetNetworkIps.new,
+            :path     => "network/#{network_id}/ipAddresses"
           }
           if self.is_a?(Fog::Terremark::Ecloud::Real)
             opts[:path] = "/extensions/network/#{network_id}/ips"

data/lib/fog/compute/terremark/requests/get_node_services.rb

@@ -14,11 +14,11 @@ module Fog
         #
         def get_node_services(service_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetNodeServices.new,
-              :path     => "api/extensions/v1.6/internetService/#{service_id}/nodeServices",
-              :override_path => true
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetNodeServices.new,
+            :path     => "api/extensions/v1.6/internetService/#{service_id}/nodeServices",
+            :override_path => true
           )
         end
       end

data/lib/fog/compute/terremark/requests/get_organization.rb

@@ -10,19 +10,19 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'description'<~String> - Description of organization
-        #     * 'links'<~Array> - An array of links to entities in the organization
-        #       * 'href'<~String> - location of link
-        #       * 'name'<~String> - name of link
-        #       * 'rel'<~String> - action to perform
-        #       * 'type'<~String> - type of link
-        #     * 'name'<~String> - Name of organization
+        #     * "description"<~String> - Description of organization
+        #     * "links"<~Array> - An array of links to entities in the organization
+        #       * "href"<~String> - location of link
+        #       * "name"<~String> - name of link
+        #       * "rel"<~String> - action to perform
+        #       * "type"<~String> - type of link
+        #     * "name"<~String> - Name of organization
         def get_organization(organization_id)
           response = request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetOrganization.new,
-              :path     => "org/#{organization_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetOrganization.new,
+            :path     => "org/#{organization_id}"
           )
           response
         end
@@ -33,19 +33,19 @@ module Fog
           organization_id = organization_id.to_i
           response = Excon::Response.new
 
-          if org = self.data[:organizations].find { |org| org[:info][:id] == organization_id }
+          if org = data[:organizations].detect { |attributes| attributes[:info][:id] == organization_id }
 
             body = { "name" => org[:info][:name],
                      "href" => "#{@base_url}/org/#{org[:info][:id]}",
                      "Links" => [] }
 
             body["Links"] = case self
-                              when Fog::Terremark::Vcloud::Mock
-                                _vdc_links(org[:vdcs][0])
-                              when Fog::Terremark::Ecloud::Mock
-                                org[:vdcs].map do |vdc|
-                                  _vdc_links(vdc)
-                                end.flatten
+                            when Fog::Terremark::Vcloud::Mock
+                              _vdc_links(org[:vdcs][0])
+                            when Fog::Terremark::Ecloud::Mock
+                              org[:vdcs].map do |vdc|
+                                _vdc_links(vdc)
+                              end.flatten
                             end
 
             response.status = 200

data/lib/fog/compute/terremark/requests/get_organizations.rb

@@ -8,9 +8,9 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
-        #     * 'description'<~String> - Description of organization
-        #     * 'links'<~Array> - An array of links to entities in the organization
-        #     * 'name'<~String> - Name of organization
+        #     * "description"<~String> - Description of organization
+        #     * "links"<~Array> - An array of links to entities in the organization
+        #     * "name"<~String> - Name of organization
         def organizations
           request(
             :expects => 200,
@@ -34,7 +34,8 @@ module Fog
 
         def org_fixture
           data[:organizations].map do |organization|
-            { "name" => organization[:info][:name],
+            {
+              "name" => organization[:info][:name],
               "href" => "#{@base_url}/org/#{organization[:info][:id]}",
               "type" => "application/vnd.vmware.vcloud.org+xml"
             }

data/lib/fog/compute/terremark/requests/get_public_ip.rb

@@ -10,15 +10,15 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'PublicIpAddresses'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
+        #     * "PublicIpAddresses"<~Array>
+        #       * "href"<~String> - linke to item
+        #       * "name"<~String> - name of item
         def get_public_ip(public_ip_id)
           opts = {
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::PublicIp.new,
-              :path     => "publicIps/#{public_ip_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::PublicIp.new,
+            :path     => "publicIps/#{public_ip_id}"
           }
           if self.class == Fog::Terremark::Ecloud::Real
             opts[:path] = "extensions/publicIp/#{public_ip_id}"

data/lib/fog/compute/terremark/requests/get_public_ips.rb

@@ -10,15 +10,15 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'PublicIpAddresses'<~Array>
-        #       * 'href'<~String> - link to item
-        #       * 'name'<~String> - name of item
+        #     * "PublicIpAddresses"<~Array>
+        #       * "href"<~String> - link to item
+        #       * "name"<~String> - name of item
         def get_public_ips(vdc_id)
           opts = {
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetPublicIps.new,
-              :path     => "vdc/#{vdc_id}/publicIps"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetPublicIps.new,
+            :path     => "vdc/#{vdc_id}/publicIps"
           }
           if self.class == Fog::Terremark::Ecloud::Real
             opts[:path] = "extensions/vdc/#{vdc_id}/publicIps"
@@ -38,10 +38,10 @@ module Fog
             vdc[:public_ips].each do |ip|
               ip = { "name" => ip[:name],
                      "href" => case self
-                                 when Fog::Terremark::Ecloud::Mock
-                                   "#{@base_url}/extensions/publicIp/#{ip[:id]}"
-                                 when Fog::Terremark::Vcloud::Mock
-                                   "#{@base_url}/PublicIps/#{ip[:id]}"
+                               when Fog::Terremark::Ecloud::Mock
+                                 "#{@base_url}/extensions/publicIp/#{ip[:id]}"
+                               when Fog::Terremark::Vcloud::Mock
+                                 "#{@base_url}/PublicIps/#{ip[:id]}"
                                end,
                      "id"   => ip[:id].to_s }
               body["PublicIpAddresses"] << ip
@@ -50,10 +50,10 @@ module Fog
             response.body = body
             response.headers = Fog::Compute::Terremark::Mock.headers(response.body,
                                                                     case self
-                                                                      when Fog::Terremark::Ecloud::Mock
-                                                                        "application/vnd.tmrk.ecloud.publicIpsList+xml"
-                                                                      when Fog::Terremark::Vcloud::Mock
-                                                                        "application/xml; charset=utf-8"
+                                                                    when Fog::Terremark::Ecloud::Mock
+                                                                      "application/vnd.tmrk.ecloud.publicIpsList+xml"
+                                                                    when Fog::Terremark::Vcloud::Mock
+                                                                      "application/xml; charset=utf-8"
                                                                     end
             )
           else

data/lib/fog/compute/terremark/requests/get_task.rb

@@ -10,25 +10,25 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'endTime'<~String> - endTime of task
-        #     * 'href'<~String> - link to task
-        #     * 'startTime'<~String> - startTime of task
-        #     * 'status'<~String> - status of task
-        #     * 'type'<~String> - type of task
-        #     * 'Owner'<~String> -
-        #       * 'href'<~String> - href of owner
-        #       * 'name'<~String> - name of owner
-        #       * 'type'<~String> - type of owner
-        #     * 'Result'<~String> -
-        #       * 'href'<~String> - href of result
-        #       * 'name'<~String> - name of result
-        #       * 'type'<~String> - type of result
+        #     * "endTime"<~String> - endTime of task
+        #     * "href"<~String> - link to task
+        #     * "startTime"<~String> - startTime of task
+        #     * "status"<~String> - status of task
+        #     * "type"<~String> - type of task
+        #     * "Owner"<~String> -
+        #       * "href"<~String> - href of owner
+        #       * "name"<~String> - name of owner
+        #       * "type"<~String> - type of owner
+        #     * "Result"<~String> -
+        #       * "href"<~String> - href of result
+        #       * "name"<~String> - name of result
+        #       * "type"<~String> - type of result
         def get_task(task_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::Task.new,
-              :path     => "task/#{task_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::Task.new,
+            :path     => "task/#{task_id}"
           )
         end
       end

data/lib/fog/compute/terremark/requests/get_tasks_list.rb

@@ -10,18 +10,18 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'CatalogItems'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
-        #       * 'type'<~String> - type of item
-        #     * 'description'<~String> - Description of catalog
-        #     * 'name'<~String> - Name of catalog
+        #     * "CatalogItems"<~Array>
+        #       * "href"<~String> - linke to item
+        #       * "name"<~String> - name of item
+        #       * "type"<~String> - type of item
+        #     * "description"<~String> - Description of catalog
+        #     * "name"<~String> - Name of catalog
         def get_tasks_list(tasks_list_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetTasksList.new,
-              :path     => "tasksList/#{tasks_list_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetTasksList.new,
+            :path     => "tasksList/#{tasks_list_id}"
           )
         end
       end

data/lib/fog/compute/terremark/requests/get_vapp.rb

@@ -13,25 +13,25 @@ module Fog
 
         # FIXME
 
-        #     * 'endTime'<~String> - endTime of task
-        #     * 'href'<~String> - link to task
-        #     * 'startTime'<~String> - startTime of task
-        #     * 'status'<~String> - status of task
-        #     * 'type'<~String> - type of task
-        #     * 'Owner'<~String> -
-        #       * 'href'<~String> - href of owner
-        #       * 'name'<~String> - name of owner
-        #       * 'type'<~String> - type of owner
-        #     * 'Result'<~String> -
-        #       * 'href'<~String> - href of result
-        #       * 'name'<~String> - name of result
-        #       * 'type'<~String> - type of result
+        #     * "endTime"<~String> - endTime of task
+        #     * "href"<~String> - link to task
+        #     * "startTime"<~String> - startTime of task
+        #     * "status"<~String> - status of task
+        #     * "type"<~String> - type of task
+        #     * "Owner"<~String> -
+        #       * "href"<~String> - href of owner
+        #       * "name"<~String> - name of owner
+        #       * "type"<~String> - type of owner
+        #     * "Result"<~String> -
+        #       * "href"<~String> - href of result
+        #       * "name"<~String> - name of result
+        #       * "type"<~String> - type of result
         def get_vapp(vapp_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::Vapp.new,
-              :path     => "vapp/#{vapp_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::Vapp.new,
+            :path     => "vapp/#{vapp_id}"
           )
         end
       end

data/lib/fog/compute/terremark/requests/get_vapp_template.rb

@@ -13,18 +13,18 @@ module Fog
 
         # FIXME
 
-        #     * 'CatalogItems'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
-        #       * 'type'<~String> - type of item
-        #     * 'description'<~String> - Description of catalog
-        #     * 'name'<~String> - Name of catalog
+        #     * "CatalogItems"<~Array>
+        #       * "href"<~String> - linke to item
+        #       * "name"<~String> - name of item
+        #       * "type"<~String> - type of item
+        #     * "description"<~String> - Description of catalog
+        #     * "name"<~String> - Name of catalog
         def get_vapp_template(vapp_template_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetVappTemplate.new,
-              :path     => "vAppTemplate/#{vapp_template_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetVappTemplate.new,
+            :path     => "vAppTemplate/#{vapp_template_id}"
           )
         end
       end

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

@@ -13,18 +13,18 @@ module Fog
 
         # FIXME
 
-        #     * 'CatalogItems'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
-        #       * 'type'<~String> - type of item
-        #     * 'description'<~String> - Description of catalog
-        #     * 'name'<~String> - Name of catalog
+        #     * "CatalogItems"<~Array>
+        #       * "href"<~String> - linke to item
+        #       * "name"<~String> - name of item
+        #       * "type"<~String> - type of item
+        #     * "description"<~String> - Description of catalog
+        #     * "name"<~String> - Name of catalog
         def get_vdc(vdc_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetVdc.new,
-              :path     => "vdc/#{vdc_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetVdc.new,
+            :path     => "vdc/#{vdc_id}"
           )
         end
       end
@@ -41,10 +41,10 @@ module Fog
                 "href" => "#{@base_url}/vdc/#{vdc[:id]}",
                 "StorageCapacity" => {},
                 "ComputeCapacity" => {
-                    "InstantiatedVmsQuota" => {},
-                    "DeployedVmsQuota" => {},
-                    "Cpu" => {},
-                    "Memory" => {}
+                  "InstantiatedVmsQuota" => {},
+                  "DeployedVmsQuota" => {},
+                  "Cpu" => {},
+                  "Memory" => {}
                 },
                 "ResourceEntities" => [],
                 "AvailableNetworks" => [],
@@ -58,18 +58,18 @@ module Fog
 
                 body["ComputeCapacity"] = {
                     "InstantiatedVmsQuota" => {
-                        "Limit" => "-1",
-                        "Used" => "-1"
+                      "Limit" => "-1",
+                      "Used" => "-1"
                     },
                     "DeployedVmsQuota" => {
-                        "Limit" => "-1",
-                        "Used" => "-1"
+                      "Limit" => "-1",
+                      "Used" => "-1"
                     },
                     "Cpu" => {
-                        "Units" => "hz * 10^6"
+                      "Units" => "hz * 10^6"
                     },
                     "Memory" => {
-                        "Units" => "bytes * 2^20"
+                      "Units" => "bytes * 2^20"
                     }
                 }
 
@@ -78,63 +78,63 @@ module Fog
                 end
 
                 body["links"] << {
-                    "name" => "Public IPs",
-                    "href" => "#{@base_url}/extensions/vdc/#{vdc[:id]}/publicIps",
-                    "rel"  => "down",
-                    "type" => "application/vnd.tmrk.ecloud.publicIpsList+xml"
+                  "name" => "Public IPs",
+                  "href" => "#{@base_url}/extensions/vdc/#{vdc[:id]}/publicIps",
+                  "rel"  => "down",
+                  "type" => "application/vnd.tmrk.ecloud.publicIpsList+xml"
                 }
 
                 body["links"] << {
-                    "name" => "Internet Services",
-                    "href" => "#{@base_url}/extensions/vdc/#{vdc[:id]}/internetServices",
-                    "rel"  => "down",
-                    "type" => "application/vnd.tmrk.ecloud.internetServicesList+xml"
+                  "name" => "Internet Services",
+                  "href" => "#{@base_url}/extensions/vdc/#{vdc[:id]}/internetServices",
+                  "rel"  => "down",
+                  "type" => "application/vnd.tmrk.ecloud.internetServicesList+xml"
                 }
 
                 body["links"] << {
-                    "name" => "Firewall Access List",
-                    "href" => "#{@base_url}/extensions/vdc/#{vdc[:id]}/firewallAcls",
-                    "rel"  => "down",
-                    "type" => "application/vnd.tmrk.ecloud.firewallAclsList+xml"
+                  "name" => "Firewall Access List",
+                  "href" => "#{@base_url}/extensions/vdc/#{vdc[:id]}/firewallAcls",
+                  "rel"  => "down",
+                  "type" => "application/vnd.tmrk.ecloud.firewallAclsList+xml"
                 }
 
               when Fog::Terremark::Vcloud::Mock
                 body["links"] << {
-                    "name" => "Public IPs",
-                    "href" => "#{@base_url}/vdc/#{vdc[:id]}/publicIps",
-                    "rel"  => "down",
-                    "type" => "application/xml"
+                  "name" => "Public IPs",
+                  "href" => "#{@base_url}/vdc/#{vdc[:id]}/publicIps",
+                  "rel"  => "down",
+                  "type" => "application/xml"
                 }
 
                 body["links"] << {
-                    "name" => "Internet Services",
-                    "href" => "#{@base_url}/vdc/#{vdc[:id]}/internetServices",
-                    "rel"  => "down",
-                    "type" => "application/xml"
+                  "name" => "Internet Services",
+                  "href" => "#{@base_url}/vdc/#{vdc[:id]}/internetServices",
+                  "rel"  => "down",
+                  "type" => "application/xml"
                 }
             end
 
             vdc[:vms].each do |vm|
               body["ResourceEntities"] << {
-                  "name" => vm[:name],
-                  "href" => "#{@base_url}/vapp/#{vm[:id]}",
-                  "type" => "application/vnd.vmware.vcloud.vApp+xml"
+                "name" => vm[:name],
+                "href" => "#{@base_url}/vapp/#{vm[:id]}",
+                "type" => "application/vnd.vmware.vcloud.vApp+xml"
               }
             end
 
             vdc[:networks].each do |network|
               body["AvailableNetworks"] << {
-                  "name" => network[:name],
-                  "href" => "#{@base_url}/network/#{network[:id]}",
-                  "type" => "application/vnd.vmware.vcloud.network+xml"
+                "name" => network[:name],
+                "href" => "#{@base_url}/network/#{network[:id]}",
+                "type" => "application/vnd.vmware.vcloud.network+xml"
               }
             end
 
             body["links"] << {
-                "name" => vdc[:name],
-                "href" => "#{@base_url}/vdc/#{vdc[:id]}/catalog",
-                "rel"  => "down",
-                "type" => "application/vnd.vmware.vcloud.catalog+xml"
+              "name" => vdc[:name],
+              "href" => "#{@base_url}/vdc/#{vdc[:id]}/catalog",
+              "rel"  => "down",
+              "type" => "application/vnd.vmware.vcloud.catalog+xml"
             }
 
             response.status = 200