fog-arubacloud 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa635004717fc04fec344b20fd32351155d890a61d81feb1a024de92ac818d0
-  data.tar.gz: 222d0047f68b9082a59e5d20a64226d2ce08726bc6ac82f036f0f205c2dd3b61
+  metadata.gz: 8ee7bdccbe197e3f4bc5591b739b61cfca8088504c04f999e6727a148711eda5
+  data.tar.gz: 7fff5cf532f0f70c877216440cfbe6ed79446fe65c239c702a1be547a10f3855
 SHA512:
-  metadata.gz: 5bd96f4d0cf62987126ab6e59ad71df609b54dd344f9a1f67ddf857a138f62859f9301512a52b1fb86170e54f38e2dc663fb79ed217fbd4da91b77a136c29688
-  data.tar.gz: c14069bb59ab739dbe82f36ff9e76cded50b592e3ecb0b7a4cc6985caf19f2b883649baefbbf914971ff9b8c0e593f839ddfb07d4b9442c7a780c844a57e17b8
+  metadata.gz: b54ebb4691fdfffae7f42a7a37b14b25aebbe291516931d4c9316f0001a346e3be0883b56c1fb9a6ac13e6afdbc25abd02cbc37cfdb41b33406cefecb9e540a8
+  data.tar.gz: 1b4e6ef025dae4ea6d211e0b093dd8ed0d89c321afd57678548a07be2c3a5345fbe5c303806c15875bd195548af2bad720636d6a62f1ae2b4bc3f46e7f767bd6

data/README.md

@@ -23,6 +23,12 @@ Or install it yourself as:
 
     $ gem install fog-arubacloud
 
+
+## Update 
+
+
+In package has been updated the 'snapshot' methods , and has added  'list_snapshot ' feature to see if a snapshot exist;   
+
 ## Usage
 
 TODO: Write usage instructions here

data/lib/fog/arubacloud.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 #
 # Author:: Alessio Rocchi (<alessio.rocchi@staff.aruba.it>)
 # © Copyright ArubaCloud.
@@ -17,7 +18,16 @@ module Fog
     DEFAULT_API_VERSION = '2.9'
     DEFAULT_WS_ENDUSER_URL = "https://api.dc2.computing.cloud.it/WsEndUser/v#{DEFAULT_API_VERSION}/WsEndUser.svc/json"
 
+    #   fix for deadlock during : "SetEnqueueServerCreation" :
+    #   wait response ( not completation of create_server...  process) from cloud before continue
+    #
+    @@mymutex = Mutex.new
+
+    def self.getUserMutex
+      @@mymutex
+    end
+
     service(:compute, 'Compute')
     
   end
-end
+end

data/lib/fog/arubacloud/compute.rb

@@ -19,6 +19,13 @@ module Fog
       PRO_HV_LC = 3
       SMART     = 4
 
+      SNAPOPTYPE = {
+        "Create"  => "1",
+        "Delete"  => "2",
+        "Restore" => "3",
+        "List" => "4"
+      }
+
       recognizes :url
       requires :arubacloud_username, :arubacloud_password
 
@@ -59,6 +66,7 @@ module Fog
       request :get_purchased_ip_addresses
       request :get_hypervisors
       request :reinitialize_vm
+      request :list_snapshot
       request :create_snapshot
       request :apply_snapshot
       request :delete_snapshot
@@ -125,7 +133,6 @@ module Fog
               :body => Fog::JSON.encode(body)
           }
           response = nil
-
           if benchmark
             time = Benchmark.realtime {
               response = _request(options)

data/lib/fog/arubacloud/compute/models/server.rb

@@ -20,6 +20,13 @@ module Fog
         ARCHIVED = 4
         DELETED = 5
 
+        STATE_DES = {  Fog::ArubaCloud::Compute::Server::CREATING  => "Creating",
+               Fog::ArubaCloud::Compute::Server::STOPPED  => "Stopped",
+               Fog::ArubaCloud::Compute::Server::RUNNING  => "Running",
+               Fog::ArubaCloud::Compute::Server::ARCHIVED  => "Archived",
+               Fog::ArubaCloud::Compute::Server::DELETED  => "Deleted"
+                   }
+
         #collection_name :servers
 
         # This is the instance ID which is unique per Datacenter
@@ -196,22 +203,22 @@ module Fog
         def restore
           requires :id, :memory, :cpu
           state == ARCHIVED and memory != nil and cpu != nil ? service.restore_vm(id) : raise(
-              Fog::ArubaCloud::Errors::VmStatus.new("Cannot restore VM without specifying #{cpu} and #{memory}"
-              ))
+              Fog::ArubaCloud::Errors::VmStatus.new("Cannot restore VM without specifying #{cpu} and #{memory}"))
+        end
+
+        def list_snapshot
+          requires :id
+          id != nil  ? service.list_snapshot(id) : raise(Fog::ArubaCloud::Errors::VmStatus.new('Cannot list snapshot without vm id'))
         end
 
         def create_snapshot
           requires :id
-          id != nil ? service.create_snapshot(id) : raise(Fog::ArubaCloud::Errors::VmStatus.new(
-              'Cannot crate snapshot without vm id'
-          ))
+          id != nil  ? service.create_snapshot(id) : raise(Fog::ArubaCloud::Errors::VmStatus.new('Cannot create snapshot without vm id'))
         end
 
         def apply_snapshot
           requires :id
-          self.action_hook(method=:apply_snapshot, expected_state=STOPPED,
-                           message="Cannot restore vm in current state: #{state}"
-          )
+          self.action_hook(method=:apply_snapshot, expected_state=STOPPED, message="Cannot restore vm in current state: #{state}" )
         end
 
         def delete_snapshot

data/lib/fog/arubacloud/compute/models/snapshot.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 #
 # Author:: Dangleterre Michaël
 # © Copyright ArubaCloud.
@@ -14,10 +15,11 @@ module Fog
         CREATING = 'Create'
         APPLYING = 'Restore'
         DELETING = 'Delete'
+        LIST = 'List'
         identity :id, :aliases => 'id'
 
-        attribute :ServerId, :aliases => 'serverid'
-        attribute :SnapshotOperation, :aliases => 'Snapshot Operation'
+        attribute :serverId, :aliases => 'serverId'
+        attribute :snapshotOperation, :aliases => 'snapshotOperation'
 
         def initialize(attributes = {})
           @service = attributes[:service]
@@ -25,8 +27,19 @@ module Fog
             'operation impossible'
           end
         end
+
+        def list
+          requires :serverId
+          data = :attributes
+          if :name != nil
+            data[:name] = name
+          else
+            raise Fog::ArubaCloud::Errors::BadParameters.Exception('Missing Parameter')
+          end
+        end # List
+
         def create
-          requires :ServerId
+          requires :serverId
           data = :attributes
           if :name != nil
             data[:name] = name
@@ -34,8 +47,9 @@ module Fog
             raise Fog::ArubaCloud::Errors::BadParameters.Exception('Missing Parameter')
           end
         end # Create
+
         def apply
-          requires :ServerId
+          requires :serverId
           data = :attributes
           if :name != nil
             data[:name] = name
@@ -43,8 +57,9 @@ module Fog
             raise Fog::ArubaCloud::Errors::BadParameters.Exception('Missing Parameter')
           end
         end # Apply
+
         def delete
-          requires :ServerId
+          requires :serverId
           data = :attributes
           if :name != nil
             data[:name] = name
@@ -55,4 +70,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/arubacloud/compute/models/snapshots.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 #
 # Author:: Dangleterre Michaël
 # © Copyright ArubaCloud.
@@ -13,7 +14,17 @@ module Fog
     class Compute
       class Snapshots < Fog::Collection
         model Fog::ArubaCloud::Compute::Snapshot
+        # Returns list of Ip Addresses
+        # @return [Fog::ArubaCloud::Compute::Ips]
+        # @raise [Fog::ArubaCloud::Errors::NotFound]
+        def all
+          # TODO: Implement single item retrieve
+        end
+        # Returns a single snapshot object
+        def get
+          # TODO: Implement single item retrieve
+        end
       end
     end
   end
-end
+end

data/lib/fog/arubacloud/compute/requests/apply_snapshot.rb

@@ -15,22 +15,25 @@ module Fog
   module ArubaCloud
     class Compute
       class Real
-        # Apply a snapshot on a VM
-        def apply_snapshot(data)
-          (service.servers).all.each do |server|
-            id = server.id if (server.name).include? data[:name]
-          end
-          body = {
-              :Snapshot => {
-                  :ServerId => id,
-                  :SnapshotOperationTypes => 'Restore'
-              }
-          }
-          self.request(
-                  body=body,
-                  method_name='SetEnqueueServerSnapshot',
-                  failure_message='Error while applying snapshot.'
+        # Apply (restore) a snapshot on a VM
+        def apply_snapshot(id)
+          body = self.body('SetEnqueueServerSnapshot').merge(
+            {
+              :ServerId => id ,  :SnapshotOperation => Fog::ArubaCloud::Compute::SNAPOPTYPE["Restore"]
+            }
           )
+          response = nil
+          time = Benchmark.realtime {
+            response = request(body , 'SetEnqueueServerSnapshot', 'Error while attempting to restore a snapshot.')
+          }
+          Fog::Logger.debug("SetEnqueueServerSnapshot time: #{time}")
+          if response['Success']
+            response_ext = response.merge( {  "Req" => "restore" , "Id" => id })
+            response_ext
+          else
+            raise Fog::ArubaCloud::Errors::RequestError.new(response)
+          end
+
         end #Apply
       end #Real
 

data/lib/fog/arubacloud/compute/requests/create_snapshot.rb

@@ -17,21 +17,24 @@ module Fog
 
       class Real
         # Create a new snapshot of a VM
-        def create_snapshot(data)
-          (service.servers).all.each do |server|
-            id = server.id if (server.name).include? data[:name]
-          end
-          body = {
-                  :Snapshot => {
-                      :ServerId => id,
-                      :SnapshotOperationTypes => 'Create'
-                  }
-              }
-          self.request(
-                  body=body,
-                  method_name='SetEnqueueServerSnapshot',
-                  failure_message='Error while attempting to create a snapshot.'
+        def create_snapshot(id)
+          body = self.body('SetEnqueueServerSnapshot').merge(
+            {
+              :ServerId => id ,  :SnapshotOperation => Fog::ArubaCloud::Compute::SNAPOPTYPE["Create"]
+            }
           )
+          response = nil
+          time = Benchmark.realtime {
+            response = request(body , 'SetEnqueueServerSnapshot', 'Error while attempting to create a snapshot.')
+          }
+          Fog::Logger.debug("SetEnqueueServerSnapshot time: #{time}")
+          if response['Success']
+            response_ext = response.merge( {  "Req" => "create" , "Id" => id })
+            response_ext
+          else
+            raise Fog::ArubaCloud::Errors::RequestError.new(response)
+          end
+
         end #Create_snapshot
       end #Real
 

data/lib/fog/arubacloud/compute/requests/create_vm_pro.rb

@@ -52,8 +52,12 @@ module Fog
 
           response = nil
           time = Benchmark.realtime {
-            response = request(body, 'SetEnqueueServerCreation', 'SetEnqueueServerCreation Error')
+            mymux = Fog::ArubaCloud.getUserMutex
+            mymux.synchronize {
+              response = request( body, 'SetEnqueueServerCreation', 'Pro_vm creation error')
+            }
           }
+
           Fog::Logger.debug("SetEnqueueServerCreation time: #{time}")
           if response['Success']
             response

data/lib/fog/arubacloud/compute/requests/create_vm_smart.rb

@@ -40,8 +40,12 @@ module Fog
 
           response = nil
           time = Benchmark.realtime {
-            response = request( body, 'SetEnqueueServerCreation', "Smart_vm creation error"  )
+            mymux = Fog::ArubaCloud.getUserMutex
+            mymux.synchronize {
+              response = request( body, 'SetEnqueueServerCreation', "Smart_vm creation error"  )
+            }
           }
+
           Fog::Logger.debug("SetEnqueueServerCreation time: #{time}")
           if response['Success']
             response

data/lib/fog/arubacloud/compute/requests/delete_snapshot.rb

@@ -15,30 +15,25 @@ module Fog
   module ArubaCloud
     class Compute
       class Real
-        # Apply a snapshot on a VM
-        def delete_snapshot(data)
-          (service.servers).all.each do |server|
-            id = server.id if (server.name).include? data[:name]
-          end
+        # Delete a snapshot on a VM
+        def delete_snapshot(id)
           body = self.body('SetEnqueueServerSnapshot').merge(
-              {
-                  :Snapshot => {
-                      :ServerId => id,
-                      :SnapshotOperationTypes => 'Delete'
-                  }
-              }
+            {
+              :ServerId => id ,  :SnapshotOperation => Fog::ArubaCloud::Compute::SNAPOPTYPE["Delete"]
+            }
           )
           response = nil
           time = Benchmark.realtime {
-            response = request(body , 'SetEnqueueServerSnapshot', 'SetEnqueueServerSnapshot Error')
+            response = request(body , 'SetEnqueueServerSnapshot', 'Error while attempting to delete a snapshot.')
           }
           Fog::Logger.debug("SetEnqueueServerSnapshot time: #{time}")
           if response['Success']
-            response
+            response_ext = response.merge( {  "Req" => "Delete" , "Id" => id })
+            response_ext
           else
             raise Fog::ArubaCloud::Errors::RequestError.new(response)
           end
-        end #Apply
+        end #Delete
       end #Real
 
       class Mock

data/lib/fog/arubacloud/compute/requests/list_snapshot.rb

@@ -0,0 +1,90 @@
+# coding: utf-8
+#
+# Author:: Ugo Vierucci (<ugo.vierucci@staff.aruba.it>)
+# © Copyright ArubaCloud.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/arubacloud/service'
+require 'fog/arubacloud/error'
+require 'benchmark'
+
+
+module Fog
+  module ArubaCloud
+    class Compute
+
+      class Real
+        # List snapshot info  of a VM if exist a snapshot 
+        def list_snapshot(id)
+          body = self.body('GetServersList').merge(
+            {
+              :operationRequest =>  {  :ServerStatuses => {}  }
+            }
+          )
+          body = self.body('GetServersList')
+          response = nil
+          dataresp = nil
+          time = Benchmark.realtime {
+            dataresp = request( body,  'GetServersList', "GetServersList Error"  )
+          }
+
+          if dataresp
+            xs = dataresp["Value"]
+            if xs
+              xs.each do | x |
+                if x["ServerId"] == id
+                  if x["Snapshots"] != [] && x["Snapshots"].length > 0 
+                    winfo = x['Snapshots'][0]
+                    wcre = winfo['CreationDate']
+                    wexp = winfo['ExpirationDate']
+                    wdatecre = "unknow"
+                    wdateexp = "unknow"
+                    if wcre
+                      w = wcre.match(/\/Date\((\d+\+\d+)\)\//)
+                      if w && w.length > 1
+                        wdatecre = DateTime.strptime(w[1], "%Q%z").strftime("%Y-%m-%d %H:%M:%S")
+                      end
+                    end
+                    if wexp
+                      w = wexp.match(/\/Date\((\d+\+\d+)\)\//)
+                      if w && w.length > 1
+                        wdateexp = DateTime.strptime(w[1], "%Q%z").strftime("%Y-%m-%d %H:%M:%S")
+                      end
+                    end
+                    response = { "Success" => true , "credate" => wdatecre , "expdate" => wdateexp , "Req" => "list" , "Id" => id}
+                    break
+                  end
+                end  
+              end
+            end
+          end
+
+          Fog::Logger.debug("GetServersList time: #{time}")
+          if response && response['Success']
+            response
+          else
+            return { "Success" => false , "Req" => "list", "Id" => id }
+          end
+
+        end #list_snapshot
+      end #Real
+
+      class Mock
+        def list_snapshot
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+              'ExceptionInfo' => nil,
+              'ResultCode' => 0,
+              'ResultMessage' => nil,
+              'Success' => true
+          }
+          response.body
+        end # list snapshot
+      end # Mock
+
+    end # Compute
+  end # ArubaCloud
+end #Fog

data/lib/fog/arubacloud/service.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 #
 # Author:: Alessio Rocchi (<alessio.rocchi@staff.aruba.it>)
 # © Copyright ArubaCloud.
@@ -29,10 +30,10 @@ module Fog
 
         # initialize connection object
         @connection = Fog::Core::Connection.new(@request_url, false, params)
-
         # send request
         begin
           response = @connection.request(:method => http_method)
+          @connection.reset
         rescue Excon::Errors::Timeout
           # raise an error
           raise Fog::ArubaCloud::Errors::RequestTimeOut.new(
@@ -53,4 +54,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/arubacloud/version.rb

@@ -8,6 +8,6 @@
 
 module Fog
   module ArubaCloud
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-arubacloud
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Aruba S.p.A.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -203,6 +203,7 @@ files:
 - lib/fog/arubacloud/compute/requests/get_server_details.rb
 - lib/fog/arubacloud/compute/requests/get_servers.rb
 - lib/fog/arubacloud/compute/requests/get_shared_storage.rb
+- lib/fog/arubacloud/compute/requests/list_snapshot.rb
 - lib/fog/arubacloud/compute/requests/manage_custom_template.rb
 - lib/fog/arubacloud/compute/requests/modify_loadbalancer.rb
 - lib/fog/arubacloud/compute/requests/power_off_vm.rb