deltacloud-core 1.1.1 → 1.1.2

data/lib/deltacloud/drivers/ec2/ec2_driver.rb

@@ -35,16 +35,20 @@ module Deltacloud
     module Ec2
       class Ec2Driver < Deltacloud::BaseDriver
 
-        feature :instances, :user_data
-        feature :instances, :authentication_key
-        feature :instances, :firewalls
-        feature :instances, :instance_count
-        feature :instances, :metrics
-        feature :images, :owner_id
-        feature :images, :image_name
-        feature :images, :image_description
+        feature :instances,
+          :user_data,
+          :authentication_key,
+          :firewalls,
+          :instance_count,
+          :metrics,
+          :attach_snapshot
+
+        feature :images,
+          :owner_id,
+          :image_name,
+          :image_description
+
         feature :buckets, :bucket_location
-        feature :instances, :attach_snapshot
 
         DEFAULT_REGION = 'us-east-1'
 

data/lib/deltacloud/drivers/fgcp/fgcp_client.rb

@@ -274,6 +274,44 @@ eoidxml
     request('DestroyVDiskBackup', {'vsysId' => vsys_id, 'backupId' => backup_id})
   end
 
+  def get_vdisk_backup_copy_key(vsys_id, backup_id)
+    @version = '2012-07-20'
+    request('GetVDiskBackupCopyKey', {'vsysId' => vsys_id, 'backupId' => backup_id})
+  end
+
+  def set_vdisk_backup_copy_key(vsys_id, backup_id, contracts)
+    @version = '2012-07-20'
+    contracts_xml = <<-"eoctxml"
+<?xml version="1.0" encoding ="UTF-8"?>
+<Request>
+  <contracts>
+    <contract>
+#{contracts.collect { |c| "      <number>#{c}</number>" }.join("\n")}
+    </contract>
+  </contracts>
+</Request>
+eoctxml
+    request('SetVDiskBackupCopyKey',
+      {
+        'vsysId'   => vsys_id,
+        'backupId' => backup_id
+      },
+      contracts_xml,
+      'contractsXMLFilePath'
+    )
+  end
+
+  def external_restore_vdisk(src_vsys_id, src_backup_id, dst_vsys_id, dst_vdisk_id, key)
+    @version = '2012-07-20'
+    request('ExternalRestoreVDisk', {
+      'srcVsysId'   => src_vsys_id,
+      'srcBackupId' => src_backup_id,
+      'dstVsysId'   => dst_vsys_id,
+      'dstVdiskId'  => dst_vdisk_id,
+      'key'         => key}
+    )
+  end
+
   def list_public_ips(vsys_id=nil)
     if vsys_id.nil?
       request('ListPublicIP')
@@ -321,6 +359,12 @@ eoidxml
     $1
   end
 
+  #extract contract id from vserverId, efmId or networkId
+  def extract_contract_id(id)
+    /^(\w+)-\w+\b.*/ =~ id
+    $1
+  end
+
   private
 
   # params hash is of the form :vserverId => 'ABC123', etc.

data/lib/deltacloud/drivers/fgcp/fgcp_driver.rb

@@ -17,6 +17,7 @@
 
 require_relative 'fgcp_client'
 require_relative '../../runner'
+require_relative 'fgcp_driver_cimi_methods'
 require 'openssl'
 require 'xmlsimple'
 
@@ -109,8 +110,11 @@ class FgcpDriver < Deltacloud::BaseDriver
       if xml['diskimages'] # not likely to not be so, but just in case
         xml['diskimages'][0]['diskimage'].each do |img|
 
-          # 32bit CentOS/RHEL images are refused on hwps > 16GB (i.e. w_high, quad_high)
+          # This will determine image architecture using OS name.
+          # Usually the OS name includes '64bit' or '32bit'. If not,
+          # it will fall back to 64 bit.
           os_arch = img['osName'][0].to_s =~ /.*32.?bit.*/ ? 'i386' : 'x86_64'
+          # 32bit CentOS/RHEL images are refused on hwps > 16GB (i.e. w_high, quad_high)
           os_centos_rhel = img['osName'][0] =~ /(CentOS|Red Hat).*/
           allowed_hwps = hwps.select do |hwp|
             hwp.memory.default.to_i < 16000 or os_arch == 'x86_64' or not os_centos_rhel
@@ -122,9 +126,6 @@ class FgcpDriver < Deltacloud::BaseDriver
             :description => img['description'][0].to_s,
             :owner_id => img['registrant'][0].to_s, # or 'creatorName'?
             :state => 'AVAILABLE', #server keeps no particular state. If it's listed, it's available for use.
-            # This will determine image architecture using OS name.
-            # Usually the OS name includes '64bit' or '32bit'. If not,
-            # it will fall back to 64 bit.
             :architecture => os_arch,
             :hardware_profiles => allowed_hwps
           ) if opts[:id].nil? or opts[:id] == img['diskimageId'][0]
@@ -183,7 +184,13 @@ class FgcpDriver < Deltacloud::BaseDriver
 
         # determine id belongs to system or network
         vsys_id = client.extract_vsys_id(opts[:id])
-        vsys = client.get_vsys_attributes(vsys_id)['vsys'][0]
+        begin
+          vsys = client.get_vsys_attributes(vsys_id)['vsys'][0]
+        rescue Exception => ex
+          return [] if ex.message =~ /VALIDATION_ERROR.*A wrong value is set/
+          raise
+        end
+
         realm_name = vsys['vsysName'][0]
         limit = '[System]'
         if opts[:id] != vsys_id # network id specified
@@ -210,18 +217,24 @@ class FgcpDriver < Deltacloud::BaseDriver
                       :limit => '[System]',
                       :state => 'AVAILABLE' # map to state of FW/VSYS (reconfiguring = unavailable)?
                     )
-          # then retrieve and add list of network segments
-          client.get_vsys_configuration(vsys['vsysId'][0])['vsys'][0]['vnets'][0]['vnet'].each do |vnet|
-
-            vnet['networkId'][0] =~ /^.*\b(\w+)$/
-            realm_name = vsys['vsysName'][0].to_s + ' [' + $1 + ']' # vsys name or vsys name + network [DMZ/SECURE1/SECURE2]
-            realms << Realm::new(
-                        :id => vnet['networkId'][0], # vsysId or networkId
-                        :name => realm_name,
-                        #:limit => :unlimited,
-                        :limit => '[Network]',
-                        :state => 'AVAILABLE' # map to state of FW/VSYS (reconfiguring = unavailable)?
-                      )
+          begin
+            # then retrieve and add list of network segments
+            client.get_vsys_configuration(vsys['vsysId'][0])['vsys'][0]['vnets'][0]['vnet'].each do |vnet|
+
+              vnet['networkId'][0] =~ /^.*\b(\w+)$/
+              realm_name = vsys['vsysName'][0].to_s + ' [' + $1 + ']' # vsys name or vsys name + network [DMZ/SECURE1/SECURE2]
+              realms << Realm::new(
+                          :id => vnet['networkId'][0], # vsysId or networkId
+                          :name => realm_name,
+                          #:limit => :unlimited,
+                          :limit => '[Network]',
+                          :state => 'AVAILABLE' # map to state of FW/VSYS (reconfiguring = unavailable)?
+                        )
+            end
+          rescue Exception => ex # cater for case where vsys was just destroyed since list_vsys call
+            raise ex if not ex.message =~ /RESOURCE_NOT_FOUND.*/
+            # remove earlier added vsys
+            realms.pop
           end
         end
       end
@@ -266,20 +279,24 @@ class FgcpDriver < Deltacloud::BaseDriver
         xml[0]['vsys'].each do |vsys|
 
           # use get_vsys_configuration (instead of get_vserver_configuration) to retrieve all vservers in one call
-          vsys_config = client.get_vsys_configuration(vsys['vsysId'][0])
-          vsys_config['vsys'][0]['vservers'][0]['vserver'].each do |vserver|
-
-            # skip firewalls - they probably don't belong here and their new type ('firewall' instead of 
-            # 'economy') causes errors when trying to map to available profiles)
-            unless determine_server_type(vserver) == 'FW'
-              # to keep the response time of this method acceptable, retrieve state
-              # only if required because state is filtered on
-              state_data = opts[:state] ? instance_state_data(vserver, client) : nil
-              # filter on state
-              if opts[:state].nil? or opts[:state] == state_data[:state]
-                instances << convert_to_instance(client, vserver, state_data)
+          begin
+            vsys_config = client.get_vsys_configuration(vsys['vsysId'][0])
+            vsys_config['vsys'][0]['vservers'][0]['vserver'].each do |vserver|
+
+              # skip firewalls - they probably don't belong here and their new type ('firewall' instead of 
+              # 'economy') causes errors when trying to map to available profiles)
+              unless determine_server_type(vserver) == 'FW'
+                # to keep the response time of this method acceptable, retrieve state
+                # only if required because state is filtered on
+                state_data = opts[:state] ? instance_state_data(vserver, client) : nil
+                # filter on state
+                if opts[:state].nil? or opts[:state] == state_data[:state]
+                  instances << convert_to_instance(client, vserver, state_data)
+                end
               end
             end
+          rescue Exception => ex # cater for case where vsys was just destroyed since list_vsys call
+            raise ex if not ex.message =~ /RESOURCE_NOT_FOUND.*/
           end
         end
       end
@@ -452,7 +469,10 @@ class FgcpDriver < Deltacloud::BaseDriver
         begin
           vdisk = client.get_vdisk_attributes(opts[:id])['vdisk'][0]
         rescue Exception => ex
+          # vdisk doesn't exist
           return [] if ex.message =~ /VALIDATION_ERROR.*t exist./
+          # vsys_id extracted from :id doesn't exist
+          return [] if ex.message =~ /VALIDATION_ERROR.*A wrong value is set/
           raise
         end
         state = client.get_vdisk_status(opts[:id])['vdiskStatus'][0]
@@ -489,24 +509,28 @@ class FgcpDriver < Deltacloud::BaseDriver
         return [] if xml.nil?
         xml[0]['vsys'].each do |vsys|
 
-          vdisks = client.list_vdisk(vsys['vsysId'][0])['vdisks'][0]
-
-          if vdisks['vdisk']
-            vdisks['vdisk'].each do |vdisk|
-
-              #state requires an additional call per volume. Only set if attached.
-              #exclude system disks as they are not detachable?
-              volumes << StorageVolume.new(
-                :id          => vdisk['vdiskId'][0],
-                :name        => vdisk['vdiskName'][0],
-                :capacity    => vdisk['size'][0],
-                :instance_id => vdisk['attachedTo'].nil? ? nil : vdisk['attachedTo'][0],
-                :realm_id    => client.extract_vsys_id(vdisk['vdiskId'][0]),
-                # aligning with rhevm, which returns 'system' or 'data'
-                :kind        => determine_storage_type(vdisk['vdiskId'][0]),
-                :state       => vdisk['attachedTo'].nil? ? 'AVAILABLE' : 'IN-USE'
-              )
+          begin
+            vdisks = client.list_vdisk(vsys['vsysId'][0])['vdisks'][0]
+
+            if vdisks['vdisk']
+              vdisks['vdisk'].each do |vdisk|
+
+                #state requires an additional call per volume. Only set if attached.
+                #exclude system disks as they are not detachable?
+                volumes << StorageVolume.new(
+                  :id          => vdisk['vdiskId'][0],
+                  :name        => vdisk['vdiskName'][0],
+                  :capacity    => vdisk['size'][0],
+                  :instance_id => vdisk['attachedTo'].nil? ? nil : vdisk['attachedTo'][0],
+                  :realm_id    => client.extract_vsys_id(vdisk['vdiskId'][0]),
+                  # aligning with rhevm, which returns 'system' or 'data'
+                  :kind        => determine_storage_type(vdisk['vdiskId'][0]),
+                  :state       => vdisk['attachedTo'].nil? ? 'AVAILABLE' : 'IN-USE'
+                )
+              end
             end
+          rescue Exception => ex # cater for case where vsys was just destroyed since list_vsys call
+            raise ex if not ex.message =~ /RESOURCE_NOT_FOUND.*/
           end
         end
       end
@@ -533,7 +557,43 @@ class FgcpDriver < Deltacloud::BaseDriver
         opts[:realm_id] = xml[0]['vsys'][0]['vsysId'][0] if xml
       end
 
-      vdisk_id = client.create_vdisk(opts[:realm_id], opts[:name], opts[:capacity])['vdiskId'][0]
+      if not opts[:snapshot_id]
+        vdisk_id = client.create_vdisk(opts[:realm_id], opts[:name], opts[:capacity])['vdiskId'][0]
+      else
+        orig_vdisk_id, backup_id = split_snapshot_id(opts[:snapshot_id])
+        orig_vsys_id = client.extract_vsys_id(orig_vdisk_id)
+        # check snapshot size
+        size = client.get_vdisk_attributes(orig_vdisk_id)['vdisk'][0]['size'][0]
+        #set and retrieve key
+        contract_id = client.extract_contract_id(opts[:realm_id])
+        client.set_vdisk_backup_copy_key(orig_vsys_id, backup_id, [contract_id])
+        key = client.get_vdisk_backup_copy_key(opts[:realm_id], backup_id)['keyInfo'][0]['key'][0]
+        # create vdisk with same size as snapshot
+        size = client.get_vdisk_attributes(orig_vdisk_id)['vdisk'][0]['size'][0]
+        vdisk_id = client.create_vdisk(opts[:realm_id], opts[:name], size)['vdiskId'][0]
+        # try a restore straight away. It will likely fail (as the vdisk creation has not
+        # completed yet), but at least the parameters will be validated straight away.
+        begin
+          client.external_restore_vdisk(orig_vsys_id, backup_id, opts[:realm_id], vdisk_id, key)
+        rescue Exception => ex
+          # ignore expected error that destination vdisk is not ready yet
+          raise unless ex.message =~ /ILLEGAL_STATE_DST.*/
+        end
+        #wait until creation completes in a separate thread
+        Thread.new {
+          attempts = 0
+          begin
+            sleep 10
+            # this fails if the destination vdisk is still being deployed
+            client.external_restore_vdisk(orig_vsys_id, backup_id, opts[:realm_id], vdisk_id, key)
+          rescue Exception => ex
+            raise unless attempts < 30 and ex.message =~ /ILLEGAL_STATE_DST.*/
+            # Deployment takes a few minutes, so keep trying for a while
+            attempts += 1
+            retry
+          end
+        }
+      end
 
       StorageVolume.new(
         :id          => vdisk_id,
@@ -608,23 +668,27 @@ class FgcpDriver < Deltacloud::BaseDriver
         return [] if xml.nil?
         xml[0]['vsys'].each do |vsys|
 
-          vdisks = client.list_vdisk(vsys['vsysId'][0])['vdisks'][0]
-          if vdisks['vdisk']
-            vdisks['vdisk'].each do |vdisk|
-
-              backups = client.list_vdisk_backup(vdisk['vdiskId'][0])
-              if backups['backups'] and backups['backups'][0]['backup']
-                backups['backups'][0]['backup'].each do |backup|
-
-                  snapshots << StorageSnapshot.new(
-                    :id => generate_snapshot_id(vdisk['vdiskId'][0], backup['backupId'][0]),
-                    :state => 'AVAILABLE',
-                    :storage_volume_id => vdisk['vdiskId'][0],
-                    :created => backup['backupTime'][0]
-                  )
+          begin
+            vdisks = client.list_vdisk(vsys['vsysId'][0])['vdisks'][0]
+            if vdisks['vdisk']
+              vdisks['vdisk'].each do |vdisk|
+
+                backups = client.list_vdisk_backup(vdisk['vdiskId'][0])
+                if backups['backups'] and backups['backups'][0]['backup']
+                  backups['backups'][0]['backup'].each do |backup|
+
+                    snapshots << StorageSnapshot.new(
+                      :id => generate_snapshot_id(vdisk['vdiskId'][0], backup['backupId'][0]),
+                      :state => 'AVAILABLE',
+                      :storage_volume_id => vdisk['vdiskId'][0],
+                      :created => backup['backupTime'][0]
+                    )
+                  end
                 end
               end
             end
+          rescue Exception => ex # cater for case where vsys was just destroyed since list_vsys call
+            raise ex if not ex.message =~ /(RESOURCE_NOT_FOUND|ERROR).*/
           end
         end
       end
@@ -1168,31 +1232,35 @@ eofwopxml
       xml = client.list_vsys['vsyss']
       return [] if xml.nil?
 
-      xml[0]['vsys'].each do |vsys|
+      begin
+        xml[0]['vsys'].each do |vsys|
 
-        # use get_vsys_configuration (instead of list_efm) to retrieve all SLBs incl. realms in one call
-        vsys_config = client.get_vsys_configuration(vsys['vsysId'][0])
-        vsys_config['vsys'][0]['vservers'][0]['vserver'].each do |vserver|
+          # use get_vsys_configuration (instead of list_efm) to retrieve all SLBs incl. realms in one call
+          vsys_config = client.get_vsys_configuration(vsys['vsysId'][0])
+          vsys_config['vsys'][0]['vservers'][0]['vserver'].each do |vserver|
 
-          if determine_server_type(vserver) == 'SLB'
-            vserver['vnics'][0]['vnic'][0]['networkId'][0] =~ /^.*\b(\w+)$/
-            realm_name = vsys['vsysId'][0] + ' [' + $1 + ']' # vsys name + network [DMZ/SECURE1/SECURE2]
-            realm = Realm::new(
-              :id => vserver['vnics'][0]['vnic'][0]['networkId'][0],
-              :name => realm_name,
-              :limit => '[Network]',
-              :state => 'AVAILABLE' # map to state of FW/VSYS (reconfiguring = unavailable)?
-            )
-            balancer = LoadBalancer.new({
-              :id               => vserver['vserverId'][0],
-              :realms           => [realm],
-              :listeners        => [],
-              :instances        => [],
-              :public_addresses => []
-            })
-            balancers << balancer
+            if determine_server_type(vserver) == 'SLB'
+              vserver['vnics'][0]['vnic'][0]['networkId'][0] =~ /^.*\b(\w+)$/
+              realm_name = vsys['vsysId'][0] + ' [' + $1 + ']' # vsys name + network [DMZ/SECURE1/SECURE2]
+              realm = Realm::new(
+                :id => vserver['vnics'][0]['vnic'][0]['networkId'][0],
+                :name => realm_name,
+                :limit => '[Network]',
+                :state => 'AVAILABLE' # map to state of FW/VSYS (reconfiguring = unavailable)?
+              )
+              balancer = LoadBalancer.new({
+                :id               => vserver['vserverId'][0],
+                :realms           => [realm],
+                :listeners        => [],
+                :instances        => [],
+                :public_addresses => []
+              })
+              balancers << balancer
+            end
           end
         end
+      rescue Exception => ex # cater for case where vsys was just destroyed since list_vsys call
+        raise ex if not ex.message =~ /(RESOURCE_NOT_FOUND).*/
       end
     end
     balancers
@@ -1327,18 +1395,22 @@ eofwopxml
       # list all vservers
       realms.each do |realm_id|
 
-        xml = client.list_vservers(client.extract_vsys_id(realm_id))['vservers']
+        begin
+          xml = client.list_vservers(client.extract_vsys_id(realm_id))['vservers']
 
-        if xml and xml[0]['vserver']
+          if xml and xml[0]['vserver']
 
-          xml[0]['vserver'].each do |vserver|
+            xml[0]['vserver'].each do |vserver|
 
-            # should check whether vserver is actually in opts[:realm_id] if network segment?
-            metrics_arr << Metric.new(
-              :id     => vserver['vserverId'][0],
-              :entity => vserver['vserverName'][0]
-            )
+              # should check whether vserver is actually in opts[:realm_id] if network segment?
+              metrics_arr << Metric.new(
+                :id     => vserver['vserverId'][0],
+                :entity => vserver['vserverName'][0]
+              )
+            end
           end
+        rescue Exception => ex # cater for case where vsys was just destroyed since list_vsys call
+          raise ex if not ex.message =~ /(RESOURCE_NOT_FOUND).*/
         end
       end
 
@@ -1558,6 +1630,8 @@ eofwopxml
         images['diskimages'][0]['diskimage'].each do |img|
           if vserver['diskimageId'][0] == img['diskimageId'][0]
             instance.username = img['osName'][0] =~ /Windows.*/ ? 'Administrator' : 'root'
+            instance.instance_profile.storage = img['size'][0].to_s
+            break
           end
         end
         instance.password = client.get_vserver_initial_password(vserver['vserverId'][0])['initialPassword'][0]

data/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb

@@ -0,0 +1,74 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+#Definition of CIMI methods for the Fgcp driver - separation from deltacloud
+#API Fgcp driver methods
+
+module Deltacloud::Drivers::Fgcp
+
+  class FgcpDriver < Deltacloud::BaseDriver
+
+    #cimi features
+    feature :machines, :default_initial_state do
+      { :values => ["STOPPED"] }
+    end
+
+    def systems(credentials, opts={})
+      safely do
+        client = new_client(credentials)
+
+        if opts and opts[:id]
+          vsys_ids = [opts[:id]]
+        else
+          xml = client.list_vsys['vsyss']
+          return [] if xml.nil?
+          vsys_ids = xml[0]['vsys'].collect { |vsys| vsys['vsysId'][0] }
+        end
+
+        vsys_ids.collect do |vsys_id|
+          vsys = client.get_vsys_configuration(vsys_id)['vsys'][0]
+          vsys_description_el = vsys['description']
+          CIMI::Model::System.new(
+            :id          => vsys['vsysId'][0],
+            :name        => vsys['vsysName'][0],
+#            :machines    => "http://cimi.example.org/systems/#{vsys['vsysId'][0]}/machines?realm_id=#{vsys['vsysId'][0]}",
+#            :volumes     => "http://cimi.example.org/systems/#{vsys['vsysId'][0]}/volumes?realm_id=#{vsys['vsysId'][0]}",
+#            :networks    => "http://cimi.example.org/systems/#{vsys['vsysId'][0]}/networks?realm_id=#{vsys['vsysId'][0]}",
+#            :addresses   => "http://cimi.example.org/systems/#{vsys['vsysId'][0]}/addresses?realm_id=#{vsys['vsysId'][0]}",
+            :description => vsys_description_el ? vsys_description_el[0] : nil
+          )
+        end
+      end
+    end
+
+    def system_templates(credentials, opts={})
+      safely do
+        client = new_client(credentials)
+        templates = client.list_vsys_descriptor['vsysdescriptors'][0]['vsysdescriptor'].collect do |desc|
+          CIMI::Model::SystemTemplate.new(
+            :id           => desc['vsysdescriptorId'][0],
+            :name         => desc['vsysdescriptorName'][0],
+            :description  => desc['description'][0]
+          )
+        end
+        templates = templates.select { |t| opts[:id] == t[:id] } if opts[:id]
+        templates
+      end
+    end
+
+  end
+
+end