fog-terremark 0.0.4 → 0.1.0

data/lib/fog/compute/terremark/parser.rb

@@ -3,11 +3,11 @@ module Fog
     class Terremark
       module Parser
         def parse(data)
-          case data['type']
-            when 'application/vnd.vmware.vcloud.vApp+xml'
-              servers.new(data.merge!(:service => self))
-            else
-              data
+          case data["type"]
+          when "application/vnd.vmware.vcloud.vApp+xml"
+            servers.new(data.merge!(:service => self))
+          else
+            data
           end
         end
       end

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

@@ -16,18 +16,18 @@ 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
+        #     * "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
         def add_internet_service(ip_id, name, protocol, port, options = {})
-          unless options.key?('Enabled')
-            options['Enabled'] = true
+          unless options.key?("Enabled")
+            options["Enabled"] = true
           end
           data = <<-DATA
           <CreateInternetServiceRequest xml:lang="en" xmlns="urn:tmrk:vCloudExpressExtensions-1.6" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -39,13 +39,13 @@ module Fog
             </CreateInternetServiceRequest>
           DATA
           request(
-              :body     => data,
-              :expects  => 200,
-              :headers  => {'Content-Type' => 'application/xml'},
-              :method   => 'POST',
-              :parser   => Fog::Parsers::Terremark::InternetService.new,
-              :path     => "api/extensions/v1.6/publicIp/#{ip_id}/internetServices",
-              :override_path => true
+            :body     => data,
+            :expects  => 200,
+            :headers  => { "Content-Type" => "application/xml" },
+            :method   => "POST",
+            :parser   => Fog::Parsers::Terremark::InternetService.new,
+            :path     => "api/extensions/v1.6/publicIp/#{ip_id}/internetServices",
+            :override_path => true
           )
         end
       end

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

@@ -16,31 +16,31 @@ 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
+        #     * "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
         def add_node_service(service_id, ip, name, port, options = {})
-          unless options.key?('Enabled')
-            options['Enabled'] = true
+          unless options.key?("Enabled")
+            options["Enabled"] = true
           end
 
           data = <<-DATA
                 <CreateNodeServiceRequest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:tmrk:vCloudExpressExtensions-1.6"><IpAddress>#{ip}</IpAddress><Name>#{name}</Name><Port>#{port}</Port><Enabled>#{options['Enabled']}</Enabled><Description>#{options['Description']}</Description></CreateNodeServiceRequest>
           DATA
           response = request(
-              :body     => data,
-              :expects  => 200,
-              :headers  => {'Content-Type' => 'application/vnd.tmrk.vCloud.nodeService+xml'},
-              :method   => 'POST',
-              :parser   => Fog::Parsers::Terremark::NodeService.new,
-              :path     => "api/extensions/v1.6/internetService/#{service_id}/nodeServices",
-              :override_path => true
+            :body     => data,
+            :expects  => 200,
+            :headers  => { "Content-Type" => "application/vnd.tmrk.vCloud.nodeService+xml" },
+            :method   => "POST",
+            :parser   => Fog::Parsers::Terremark::NodeService.new,
+            :path     => "api/extensions/v1.6/internetService/#{service_id}/nodeServices",
+            :override_path => true
           )
 
           response

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

@@ -6,14 +6,14 @@ module Fog
           items = ""
           vapp_uri = [@host, @path, "vApp", vapp_id.to_s].join("/")
 
-          if options['vcpus']
+          if options["vcpus"]
             vcpu_item = <<-DATA
 <Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"> <InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">#{options['vcpus']}</VirtualQuantity></Item>
             DATA
             items << vcpu_item
           end
 
-          if options['memory']
+          if options["memory"]
             memory_item = <<-DATA
 <Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType>38<VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">#{options['memory']}</VirtualQuantity></Item>
             DATA
@@ -26,8 +26,8 @@ module Fog
           DATA
           items << virtual_disk_item
           #Additional disks
-          if options['virtual_disks']
-            for disk in options['virtual_disks']
+          if options["virtual_disks"]
+            options["virtual_disks"].each do |disk|
               actual_size = disk.to_i * 1024 * 1024
               virtual_disk_item = <<-DATA
 <Item>
@@ -45,11 +45,11 @@ module Fog
           DATA
 
           request(
-              :body => data,
-              :expects => 202,
-              :headers => { 'Content-Type' => 'application/vnd.vmware.vCloud.vApp+xml' },
-              :method => 'PUT',
-              :path => "vapp/#{vapp_id}"
+            :body => data,
+            :expects => 202,
+            :headers => { "Content-Type" => "application/vnd.vmware.vCloud.vApp+xml" },
+            :method => "PUT",
+            :path => "vapp/#{vapp_id}"
           )
         end
       end

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

@@ -16,21 +16,21 @@ 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
+        #     * "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
         def create_internet_service(vdc_id, name, protocol, port, options = {})
-          unless options.key?('Enabled')
-            options['Enabled'] = true
+          unless options.key?("Enabled")
+            options["Enabled"] = true
           end
           #Sample: "https://services.vcloudexpress.terremark.com/api/extensions/v1.6/vdc/3142/internetServices"
-          path = vdcs.get(vdc_id).links.find { |item| item['name'] == 'Internet Services'}['href'].split(@host)[1]
+          path = vdcs.get(vdc_id).links.detect { |item| item["name"] == "Internet Services" }["href"].split(@host)[1]
           data = <<-DATA
           <CreateInternetServiceRequest xml:lang="en" xmlns="urn:tmrk:vCloudExpressExtensions-1.6" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <Name>#{name}</Name>
@@ -43,8 +43,8 @@ module Fog
           response = request(
               :body     => data,
               :expects  => 200,
-              :headers  => {'Content-Type' => 'application/vnd.tmrk.vCloud.internetService+xml'},
-              :method   => 'POST',
+              :headers  => { "Content-Type" => "application/vnd.tmrk.vCloud.internetService+xml" },
+              :method   => "POST",
               :parser   => Fog::Parsers::Terremark::InternetService.new,
               :path     => path,
               :override_path => true

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

@@ -9,10 +9,10 @@ module Fog
         #
         def delete_internet_service(internet_service_id)
           request(
-              :expects  => 200,
-              :method   => 'DELETE',
-              :path     => "api/extensions/v1.6/internetService/#{internet_service_id}",
-              :override_path => true
+            :expects  => 200,
+            :method   => "DELETE",
+            :path     => "api/extensions/v1.6/internetService/#{internet_service_id}",
+            :override_path => true
           )
         end
       end

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

@@ -9,10 +9,10 @@ module Fog
         #
         def delete_node_service(node_service_id)
           request(
-              :expects  => 200,
-              :method   => 'DELETE',
-              :path     => "api/extensions/v1.6/nodeService/#{node_service_id}",
-              :override_path => true
+            :expects  => 200,
+            :method   => "DELETE",
+            :path     => "api/extensions/v1.6/nodeService/#{node_service_id}",
+            :override_path => true
           )
         end
       end

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

@@ -9,10 +9,10 @@ module Fog
         #
         def delete_public_ip(public_ip_id)
           request(
-              :expects  => 200,
-              :method   => 'DELETE',
-              :path     => "api/extensions/v1.6/publicIp/#{public_ip_id}",
-              :override_path => true
+            :expects  => 200,
+            :method   => "DELETE",
+            :path     => "api/extensions/v1.6/publicIp/#{public_ip_id}",
+            :override_path => true
           )
         end
       end

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

@@ -9,9 +9,9 @@ module Fog
         #
         def delete_vapp(vapp_id)
           request(
-              :expects  => 202,
-              :method   => 'DELETE',
-              :path     => "vApp/#{vapp_id}"
+            :expects  => 202,
+            :method   => "DELETE",
+            :path     => "vApp/#{vapp_id}"
           )
         end
       end

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

@@ -10,21 +10,21 @@ 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
+        #     * "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
         def deploy_vapp(vapp_id)
           request(
-              :expects  => 202,
-              :method   => 'POST',
-              :parser   => Fog::Parsers::Terremark::Task.new,
-              :path     => "vApp/#{vapp_id}/action/deploy"
+            :expects  => 202,
+            :method   => "POST",
+            :parser   => Fog::Parsers::Terremark::Task.new,
+            :path     => "vApp/#{vapp_id}/action/deploy"
           )
         end
       end

data/lib/fog/compute/terremark/requests/get_catalog.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_catalog(vdc_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetCatalog.new,
-              :path     => "vdc/#{vdc_id}/catalog"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetCatalog.new,
+            :path     => "vdc/#{vdc_id}/catalog"
           )
         end
       end

data/lib/fog/compute/terremark/requests/get_catalog_item.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_catalog_item(catalog_item_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetCatalogItem.new,
-              :path     => "catalogItem/#{catalog_item_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetCatalogItem.new,
+            :path     => "catalogItem/#{catalog_item_id}"
           )
         end
       end

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

@@ -10,20 +10,20 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'InternetServices'<~Array>
-        #       * 'id'<~String> => id of the internet service
-        #       * 'name'<~String> => name of service
-        #       * 'PublicIPAddress'<~Hash>
-        #       *   'Id'<~String> => id of the public IP
-        #       *   'name'<~String> => actual ip address
+        #     * "InternetServices"<~Array>
+        #       * "id"<~String> => id of the internet service
+        #       * "name"<~String> => name of service
+        #       * "PublicIPAddress"<~Hash>
+        #       *   "Id"<~String> => id of the public IP
+        #       *   "name"<~String> => actual ip address
         #
         def get_internet_services(vdc_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetInternetServices.new,
-              :path     => "api/extensions/v1.6/vdc/#{vdc_id}/internetServices",
-              :override_path => true
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetInternetServices.new,
+            :path     => "api/extensions/v1.6/vdc/#{vdc_id}/internetServices",
+            :override_path => true
           )
         end
       end

data/lib/fog/compute/terremark/requests/get_keys_list.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
+        #     * "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
         def get_keys_list(organization_id)
           response = request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::GetKeysList.new,
-              :path     => "api/extensions/v1.6/org/#{organization_id}/keys",
-              :override_path => true
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::GetKeysList.new,
+            :path     => "api/extensions/v1.6/org/#{organization_id}/keys",
+            :override_path => true
           )
           response
         end

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

@@ -13,10 +13,10 @@ module Fog
         #   FIXME
         def get_network(network_id)
           request(
-              :expects  => 200,
-              :method   => 'GET',
-              :parser   => Fog::Parsers::Terremark::Network.new,
-              :path     => "network/#{network_id}"
+            :expects  => 200,
+            :method   => "GET",
+            :parser   => Fog::Parsers::Terremark::Network.new,
+            :path     => "network/#{network_id}"
           )
         end
       end
@@ -40,10 +40,10 @@ module Fog
                      "rel"  => "down",
                      "type" => "application/xml" }
             link["href"] = case self
-                             when Fog::Terremark::Ecloud::Mock
-                               "#{@base_url}/extensions/network/#{network_id}/ips"
-                             when Fog::Terremark::Vcloud::Mock
-                               "#{@base_url}/network/#{network_id}/ipAddresses"
+                           when Fog::Terremark::Ecloud::Mock
+                             "#{@base_url}/extensions/network/#{network_id}/ips"
+                           when Fog::Terremark::Vcloud::Mock
+                             "#{@base_url}/network/#{network_id}/ipAddresses"
                            end
             body["links"] << link
 
@@ -51,10 +51,10 @@ module Fog
             response.body = body
             response.headers = Fog::Compute::Terremark::Mock.headers(response.body,
                                                                     case self
-                                                                      when Fog::Terremark::Ecloud::Mock
-                                                                        "application/vnd.vmware.vcloud.network+xml"
-                                                                      when Fog::Terremark::Vcloud::Mock
-                                                                        "application/xml; charset=utf-8"
+                                                                    when Fog::Terremark::Ecloud::Mock
+                                                                      "application/vnd.vmware.vcloud.network+xml"
+                                                                    when Fog::Terremark::Vcloud::Mock
+                                                                      "application/xml; charset=utf-8"
                                                                     end
             )
           else