manageiq-smartstate 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0bcd345041b6da4e617fb7868b70329ddfb7356
-  data.tar.gz: ce9e91d3de3fd48f62958cb2dbbd5a09b3c69e34
+  metadata.gz: 1d2b72b1484823e29f31ec97946c358ed1bb2c2a
+  data.tar.gz: 6ca99573c4dfab61a2c9474cf4a52e1e5d1e27e1
 SHA512:
-  metadata.gz: c959e61448233d5726894b88a95913990b752f4dd5eea54c03bed11f1d515871177478715df62b0ccfe19b437bb722595f8911fa4aeff3ccf1a8a4c4e881b36b
-  data.tar.gz: e6414d9c2d70ec3a3cb4f71db61fc2b6222c3ed02712ac3f9ce40a9f3db495470fd92589bc5b4c4f05eaa7747c6fbcc07f3c225ba527b1307e32354fc6876278
+  metadata.gz: 394987f249638435e077ca2483acd4fcf75461c10467213ced9ca3b4d3a21b8ee855349414d4d773509874ccf37c87f3ecef465143e0c883cdc6ea8d0f2ac5ca
+  data.tar.gz: c48daab9410be7dcc229f0451dd4e41a4733c626c818340634757576d29965f46aeaed27889d0b31bf0a9709c118d0281de17f1c4d52083a66070199eef4b55f

data/lib/MiqVm/miq_azure_vm.rb

@@ -7,21 +7,24 @@ class MiqAzureVm < MiqVm
   def initialize(azure_handle, args)
     @azure_handle   = azure_handle
     @uri            = nil
-    @snap_name      = nil
+    @disk_name      = nil
     @resource_group = args[:resource_group]
+    @managed_image  = args[:managed_image]
 
     raise ArgumentError, "MiqAzureVm: missing required arg :name" unless (@name = args[:name])
 
     if args[:image_uri]
       @uri = args[:image_uri]
+    elsif args[:managed_image]
+      @disk_name = args[:managed_image]
     elsif args[:resource_group] && args[:name]
-      vm_obj = vm_svc.get(@name, @resource_group.name)
+      vm_obj = vm_svc.get(@name, @resource_group)
       os_disk = vm_obj.properties.storage_profile.os_disk
       if vm_obj.managed_disk?
         #
         # Use the EVM SNAPSHOT Added by the Provider
         #
-        @snap_name = os_disk.name + "__EVM__SSA__SNAPSHOT"
+        @disk_name = os_disk.name + "__EVM__SSA__SNAPSHOT"
       else
         #
         # Non-Managed Disk Snapshot handling
@@ -39,7 +42,7 @@ class MiqAzureVm < MiqVm
   def getCfg
     cfg_hash = {}
     cfg_hash['displayname'] = @name
-    file_name               = @uri ? @uri : @snap_name
+    file_name               = @uri ? @uri : @disk_name
 
     $log.debug("MiqAzureVm#getCfg: disk = #{file_name}")
 
@@ -66,8 +69,10 @@ class MiqAzureVm < MiqVm
       begin
         if @uri
           d = MiqDiskCache.new(AzureBlobDisk.new(sa_svc, @uri, d_info), 100, 128)
+        elsif @managed_image
+          d = MiqDiskCache.new(AzureManagedDisk.new(disk_svc, @disk_name, d_info), 200, 512)
         else
-          d = MiqDiskCache.new(AzureManagedDisk.new(snap_svc, @snap_name, d_info), 200, 512)
+          d = MiqDiskCache.new(AzureManagedDisk.new(snap_svc, @disk_name, d_info), 200, 512)
         end
       rescue => err
         $log.error("#{err}: Couldn't open disk file: #{df}")
@@ -102,7 +107,7 @@ class MiqAzureVm < MiqVm
     disk_format              = @vmConfig.getHash["#{disk_tag}.format"]
     disk_info.format         = disk_format unless disk_format.blank?
     disk_info.rawDisk        = true
-    disk_info.resource_group = @resource_group.name
+    disk_info.resource_group = @resource_group
     disk_info
   end
 
@@ -117,4 +122,8 @@ class MiqAzureVm < MiqVm
   def snap_svc
     @snap_svc ||= Azure::Armrest::Storage::SnapshotService.new(@azure_handle)
   end
+
+  def disk_svc
+    @disk_svc ||= Azure::Armrest::Storage::DiskService.new(@azure_handle)
+  end
 end

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.1.5".freeze
+    VERSION = "0.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-23 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest