fog 1.5.0 → 1.6.0

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

@@ -31,21 +31,22 @@ module Fog
             options['Enabled'] = true
           end
           data = <<-DATA
-  <InternetService xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:tmrk:vCloudExpress-1.0:request:createInternetService">
-    <Name>#{name}</Name>
-    <Protocol>#{protocol.upcase}</Protocol>
-    <Port>#{port}</Port>
-    <Enabled>#{options['Enabled']}</Enabled>
-    <Description>#{options['Description']}</Description>
-  </InternetService>
-  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>
+            <Protocol>#{protocol.upcase}</Protocol>
+            <Port>#{port}</Port> 
+            <Enabled>#{options['Enabled']}</Enabled>
+            <Description>#{options['Description']}</Description>
+            </CreateInternetServiceRequest>
+            DATA
           request(
             :body     => data,
             :expects  => 200,
             :headers  => {'Content-Type' => 'application/xml'},
             :method   => 'POST',
             :parser   => Fog::Parsers::Terremark::Shared::InternetService.new,
-            :path     => "publicIps/#{ip_id}/internetServices"
+            :path     => "api/extensions/v1.6/publicIp/#{ip_id}/internetServices",
+            :override_path => true
           )
         end
 

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

@@ -30,23 +30,21 @@ module Fog
           unless options.has_key?('Enabled')
             options['Enabled'] = true
           end
+
           data = <<-DATA
-  <NodeService xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:tmrk:vCloudExpress-1.0:request:createNodeService">
-    <IpAddress>#{ip}</IpAddress>
-    <Name>#{name}</Name>
-    <Port>#{port}</Port>
-    <Enabled>#{options['Enabled']}</Enabled>
-    <Description>#{options['Description']}</Description>
-  </NodeService>
-  DATA
-          request(
+                <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/xml'},
+            :headers  => {'Content-Type' => 'application/vnd.tmrk.vCloud.nodeService+xml'},
             :method   => 'POST',
-            :parser   => Fog::Parsers::Terremark::Shared::InternetService.new,
-            :path     => "internetServices/#{service_id}/nodes"
+            :parser   => Fog::Parsers::Terremark::Shared::NodeService.new,
+            :path     => "api/extensions/v1.6/internetService/#{service_id}/nodeServices",
+            :override_path => true
           )
+
+          response
         end
 
       end

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

@@ -0,0 +1,61 @@
+module Fog
+  module Terremark
+    module Shared
+      module Real
+        include Common
+        def configure_vapp(vapp_id, vapp_name, options = {})
+
+        items = ""
+        vapp_uri = [@host, @path, "vApp", vapp_id.to_s].join("/") 
+        
+        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']
+          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
+          items << memory_item
+        end
+        #Default root disk
+        virtual_disk_item = <<-DATA
+<Item>
+<AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent> <HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1048576</HostResource><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1048576</VirtualQuantity></Item>
+DATA
+        items << virtual_disk_item
+        #Additional disks
+        if options['virtual_disks']
+          for disk in options['virtual_disks']
+            actual_size = disk.to_i * 1024 * 1024
+            virtual_disk_item = <<-DATA
+<Item>
+<AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">-1</AddressOnParent><HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">#{actual_size}</HostResource><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">#{actual_size}</VirtualQuantity></Item>
+DATA
+            items << virtual_disk_item
+          end
+        end
+          
+        data = <<-DATA
+<VApp href="#{vapp_uri}" type="application/vnd.vmware.vcloud.vApp+xml" name="#{vapp_name}" status="2" size="10485760" xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<VirtualHardwareSection xmlns="http://schemas.dmtf.org/ovf/envelope/1"><Info>Virtual Hardware</Info>#{items}
+</VirtualHardwareSection>
+</VApp>
+DATA
+
+          request(
+            :body => data,
+            :expects => 202,
+            :headers => { 'Content-Type' => 'application/vnd.vmware.vCloud.vApp+xml' },
+            :method => 'PUT',
+            :path => "vapp/#{vapp_id}"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ module Fog
   module Terremark
     module Shared
       module Real
+        include Common
 
         # Reserve requested resources and deploy vApp
         #
@@ -30,23 +31,27 @@ module Fog
           unless options.has_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]
           data = <<-DATA
-  <InternetService xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:tmrk:vCloudExpress-1.0:request:createInternetService">
-    <Name>#{name}</Name>
-    <Protocol>#{protocol.upcase}</Protocol>
-    <Port>#{port}</Port>
-    <Enabled>#{options['Enabled']}</Enabled>
-    <Description>#{options['Description']}</Description>
-  </InternetService>
-  DATA
-          request(
+          <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>
+            <Protocol>#{protocol.upcase}</Protocol>
+            <Port>#{port}</Port> 
+            <Enabled>#{options['Enabled']}</Enabled>
+            <Description>#{options['Description']}</Description>
+            </CreateInternetServiceRequest>
+            DATA
+          response = request(
             :body     => data,
             :expects  => 200,
-            :headers  => {'Content-Type' => 'application/xml'},
+            :headers  => {'Content-Type' => 'application/vnd.tmrk.vCloud.internetService+xml'},
             :method   => 'POST',
             :parser   => Fog::Parsers::Terremark::Shared::InternetService.new,
-            :path     => "vdc/#{vdc_id}/internetServices"
+	    :path     => path,
+            :override_path => true
           )
+          response
         end
 
       end

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

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

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

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

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

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

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

@@ -25,7 +25,8 @@ module Fog
             :expects  => 200,
             :method   => 'GET',
             :parser   => Fog::Parsers::Terremark::Shared::GetInternetServices.new,
-            :path     => "vdc/#{vdc_id}/internetServices"
+            :path     => "api/extensions/v1.6/vdc/#{vdc_id}/internetServices",
+            :override_path => true
           )
         end
 

data/lib/fog/terremark/requests/shared/get_keys_list.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Terremark
+    module Shared
+      module Real
+        include Common
+
+        # Get list of SSH keys for an organization
+        #
+        # ==== Parameters
+        # * organization_id<~Integer> - Id of organization to lookup
+        #
+        # ==== 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
+        def get_keys_list(organization_id)
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Terremark::Shared::GetKeysList.new,
+            :path     => "api/extensions/v1.6/org/#{organization_id}/keys",
+            :override_path => true
+          )
+          response
+        end
+      
+      end
+    
+    end
+  end
+end

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

@@ -20,7 +20,8 @@ module Fog
             :expects  => 200,
             :method   => 'GET',
             :parser   => Fog::Parsers::Terremark::Shared::GetNodeServices.new,
-            :path     => "InternetServices/#{service_id}/nodes"
+            :path     => "api/extensions/v1.6/internetService/#{service_id}/nodeServices",
+            :override_path => true
           )
         end
 

data/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb

@@ -23,17 +23,27 @@ module Fog
           unless name.length < 15
             raise ArgumentError.new('Name must be fewer than 15 characters')
           end
+          unless vapp_template
+            raise ArgumentError.new("vApp Image Template is a compulsary parameter")
+          end
+          options['ssh_key_fingerprint'] ||= default_ssh_key["FingerPrint"]
           options['cpus'] ||= 1
           options['memory'] ||= 512
           options['network_id'] ||= default_network_id
           options['vdc_id'] ||= default_vdc_id
+          options['primary_dns'] ||= '208.67.222.222'
+          options['secondary_dns'] ||= '208.67.220.220'
 
           data = <<-DATA
 <?xml version="1.0" encoding="UTF-8"?>
 <InstantiateVAppTemplateParams name="#{name}" xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://services.vcloudexpress.terremark.com/api/v0.8/ns/vcloud.xsd">
   <VAppTemplate href="#{@scheme}://#{@host}/#{@path}/vAppTemplate/#{vapp_template}" />
   <InstantiationParams xmlns:vmw="http://www.vmware.com/schema/ovf">
-    <ProductSection xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q1="http://www.vmware.com/vcloud/v0.8"/>
+    <ProductSection xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q1="http://www.vmware.com/vcloud/v0.8">
+    <Property xmlns="http://schemas.dmtf.org/ovf/envelope/1" ovf:key="primaryDNS" ovf:value="#{options['primary_dns']}" />
+    <Property xmlns="http://schemas.dmtf.org/ovf/envelope/1" ovf:key="secondaryDNS" ovf:value="#{options['secondary_dns']}" />
+    <Property xmlns="http://schemas.dmtf.org/ovf/envelope/1" ovf:key="sshKeyFingerprint" ovf:value="#{options['ssh_key_fingerprint']}" />
+    </ProductSection>
     <VirtualHardwareSection xmlns:q1="http://www.vmware.com/vcloud/v0.8">
       <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>

data/lib/fog/terremark/shared.rb

@@ -72,6 +72,15 @@ module Fog
           if @cookie
             headers.merge!('Cookie' => @cookie)
           end
+          if params[:path]
+              if params[:override_path] == true
+                  path = params[:path]
+              else
+                  path = "#{@path}/#{params[:path]}"
+              end
+          else
+              path = "#{@path}"
+          end
           @connection.request({
             :body     => params[:body],
             :expects  => params[:expects],
@@ -79,7 +88,7 @@ module Fog
             :host     => @host,
             :method   => params[:method],
             :parser   => params[:parser],
-            :path     => "#{@path}/#{params[:path]}"
+            :path     => path
           })
         end
 
@@ -236,10 +245,16 @@ module Fog
         require 'fog/terremark/models/shared/networks'
         require 'fog/terremark/models/shared/server'
         require 'fog/terremark/models/shared/servers'
+        require 'fog/terremark/models/shared/image'
+        require 'fog/terremark/models/shared/images'
         require 'fog/terremark/models/shared/task'
         require 'fog/terremark/models/shared/tasks'
         require 'fog/terremark/models/shared/vdc'
         require 'fog/terremark/models/shared/vdcs'
+        require 'fog/terremark/models/shared/internetservice'
+        require 'fog/terremark/models/shared/internetservices'
+        require 'fog/terremark/models/shared/nodeservice'
+        require 'fog/terremark/models/shared/nodeservices'
         require 'fog/terremark/parsers/shared/get_catalog'
         require 'fog/terremark/parsers/shared/get_catalog_item'
         require 'fog/terremark/parsers/shared/get_internet_services'
@@ -249,6 +264,7 @@ module Fog
         require 'fog/terremark/parsers/shared/get_organizations'
         require 'fog/terremark/parsers/shared/get_public_ips'
         require 'fog/terremark/parsers/shared/get_tasks_list'
+        require 'fog/terremark/parsers/shared/get_keys_list'
         require 'fog/terremark/parsers/shared/get_vapp_template'
         require 'fog/terremark/parsers/shared/get_vdc'
         require 'fog/terremark/parsers/shared/instantiate_vapp_template'
@@ -278,10 +294,12 @@ module Fog
         require 'fog/terremark/requests/shared/get_public_ips'
         require 'fog/terremark/requests/shared/get_task'
         require 'fog/terremark/requests/shared/get_tasks_list'
+        require 'fog/terremark/requests/shared/get_keys_list'
         require 'fog/terremark/requests/shared/get_vapp'
         require 'fog/terremark/requests/shared/get_vapp_template'
         require 'fog/terremark/requests/shared/get_vdc'
         require 'fog/terremark/requests/shared/instantiate_vapp_template'
+        require 'fog/terremark/requests/shared/configure_vapp'
         require 'fog/terremark/requests/shared/power_off'
         require 'fog/terremark/requests/shared/power_on'
         require 'fog/terremark/requests/shared/power_reset'

data/lib/fog/terremark/vcloud.rb

@@ -7,7 +7,8 @@ module Fog
 
      module Defaults
        HOST   = 'services.vcloudexpress.terremark.com'
-       PATH   = '/api/v0.8'
+       PATH   = '/api/v0.8a-ext1.6'
+       #PATH   = '/api/'
        PORT   = 443
        SCHEME = 'https'
      end
@@ -96,6 +97,14 @@ module Fog
         end
      end
 
+     def default_ssh_key
+         if default_ssh_key
+             @default_ssh_key ||= begin
+                keys = get_keys_list(default_organization_id).body["Keys"]
+                keys.find { |item| item["IsDefault"] == "true" }
+            end
+         end
+     end
      class Mock
        include Fog::Terremark::Shared::Mock
        include Fog::Terremark::Shared::Parser

data/lib/fog/vcloud/compute.rb

@@ -112,8 +112,11 @@ module Fog
       request :configure_network_ip
       request :configure_vapp
       request :configure_vm_memory
+      request :configure_vm_cpus
+      request :configure_org_network
       request :configure_vm_name_description
       request :configure_vm_disks
+      request :configure_vm_password
       request :delete_vapp
       request :get_catalog_item
       request :get_customization_options
@@ -188,12 +191,12 @@ module Fog
           @username  = options[:vcloud_username]
           @password  = options[:vcloud_password]
           @host      = options[:vcloud_host]
-          @vdc_href  = options[:vcloud_default_vdc]
           @base_path = options[:vcloud_base_path]   || Fog::Vcloud::Compute::BASE_PATH
           @version   = options[:vcloud_version]     || Fog::Vcloud::Compute::DEFAULT_VERSION
           @path      = options[:vcloud_path]        || "#{@base_path}/v#{@version}"
           @port      = options[:vcloud_port]        || Fog::Vcloud::Compute::PORT
           @scheme    = options[:vcloud_scheme]      || Fog::Vcloud::Compute::SCHEME
+          @vdc_href  = options[:vcloud_default_vdc]
         end
 
         def reload
@@ -201,22 +204,19 @@ module Fog
         end
 
         def default_organization_uri
-          @default_organization_uri ||= begin
+          @default_organization_uri ||= organizations.first.href
+          @default_organization_uri
+        end
+
+        def default_vdc_href
+          if @vdc_href.nil?
             unless @login_results
               do_login
             end
-            case @login_results.body[:Org]
-            when Array
-              @login_results.body[:Org].first[:href]
-            when Hash
-              @login_results.body[:Org][:href]
-            else
-              nil
-            end
+            org = organizations.first
+            vdc = get_organization(org.href).links.find { |item| item[:type] == 'application/vnd.vmware.vcloud.vdc+xml'}
+            @vdc_href = vdc[:href]
           end
-        end
-
-        def default_vdc_href
           @vdc_href
         end
 

data/lib/fog/vcloud/models/compute/catalog_items.rb

@@ -10,8 +10,12 @@ module Fog
         attribute :href, :aliases => :Href
 
         def all
-          data = connection.get_catalog(href).body[:CatalogItems][:CatalogItem]
-          load(data)
+          catalog_item_info = connection.get_catalog_item(self.href)
+          items = connection.get_catalog_item(self.href).body[:CatalogItems]
+          if items.size > 0
+            data = items[:CatalogItem]
+            load(data)
+          end
         end
 
         def get(uri)