redo marios fixes that accidently got lost in rebase

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

@@ -1,73 +1,37 @@
 module Fog
   module Terremark
     module Shared
-      module Real
+      class Real
 
         # Instatiate a vapp template
         #
         # ==== Parameters
-        # * vdc_id<~Integer> - Id of vdc to instantiate template in
+        # * name<~String>: Name of the resulting vapp .. must start with letter, up to 15 chars alphanumeric.
         # * options<~Hash>:
         # * cpus<~Integer>: Number of cpus in [1, 2, 4, 8], defaults to 1
         # * memory<~Integer>: Amount of memory either 512 or a multiple of 1024, defaults to 512
+        # * vapp_template<~String>: id of the vapp template to be instantiated
         # ==== Returns
         # * response<~Excon::Response>:
         # * body<~Hash>:
-
-        # FIXME
-
-        #     * 'CatalogItems'<~Array>
-        #       * 'href'<~String> - linke to item
+        # * 'Links;<~Array> (e.g. up to vdc)
+        # * 'href'<~String> Link to the resulting vapp
         # * 'name'<~String> - name of item
         # * 'type'<~String> - type of item
-        #     * 'description'<~String> - Description of catalog
-        #     * 'name'<~String> - Name of catalog
-        def instantiate_vapp_template(name, options = {})
+        # * 'status'<~String> - 0(pending) --> 2(off) -->4(on)
+        def instantiate_vapp_template(name, vapp_template, options = {})
+          unless name.length < 15
+            raise ArgumentError.new('Name must be fewer than 15 characters')
+          end
           options['cpus'] ||= 1
           options['memory'] ||= 512
-
-          # FIXME: much cheating to commence
-          vdc_id        = default_vdc_id
-          network_id    = default_network_id
-          catalog_item  = 12 # Ubuntu JeOS 9.10 (64-bit)
-
-          #       case UNRESOLVED:
-          #          return "0";
-          #       case RESOLVED:
-          #          return "1";
-          #       case OFF:
-          #          return "2";
-          #       case SUSPENDED:
-          #          return "3";
-          #       case ON:
-          #          return "4";
-          #       default:
-          # 
-          # /**
-          #  * The vApp is unresolved (one or more file references are unavailable in the cloud)
-          #  */
-          # UNRESOLVED,
-          # /**
-          #  * The vApp is resolved (all file references are available in the cloud) but not deployed
-          #  */
-          # RESOLVED,
-          # /**
-          #  * The vApp is deployed and powered off
-          #  */
-          # OFF,
-          # /**
-          #  * The vApp is deployed and suspended
-          #  */
-          # SUSPENDED,
-          # /**
-          #  * The vApp is deployed and powered on
-          #  */
-          # ON;
+          options['network_id'] ||= default_network_id
+          options['vdc_id'] ||= default_vdc_id
 
           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="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/#{catalog_item}" />
+<?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"/>
     <VirtualHardwareSection xmlns:q1="http://www.vmware.com/vcloud/v0.8">
@@ -83,31 +47,27 @@ module Fog
       </Item>
     </VirtualHardwareSection>
     <NetworkConfigSection>
-          <NetworkConfig name="Network 1">
-            <Features>
-              <vmw:FenceMode>allowInOut</vmw:FenceMode>
-              <vmw:Dhcp>true</vmw:Dhcp>
-            </Features>
-            <NetworkAssociation href="https://services.vcloudexpress.terremark.com/api/v8/network/#{network_id}" />
+      <NetworkConfig>
+        <NetworkAssociation href="#{@scheme}://#{@host}/#{@path}/network/#{options['network_id']}"/>
       </NetworkConfig>
     </NetworkConfigSection>
   </InstantiationParams>
-    </InstantiateVAppTemplateParams>
-  DATA
+</InstantiateVAppTemplateParams>
+DATA
 
           request(
             :body => data,
             :expects => 200,
             :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml' },
             :method => 'POST',
-            :parser   => Fog::Parsers::Terremark::Shared::InstantiateVappTemplate.new,
-            :path     => "vdc/#{vdc_id}/action/instantiatevAppTemplate"
+            :parser => Fog::Parsers::Terremark::InstantiateVappTemplate.new,
+            :path => "vdc/#{options['vdc_id']}/action/instantiatevAppTemplate"
           )
         end
 
       end
 
-      module Mock
+      class Mock
 
         def instatiate_vapp_template(vapp_template_id)
           raise MockNotImplemented.new("Contributions welcome!")