Add method vm_move_into_folder. #285

lfu · 2018-06-08T14:45:10Z

Add method vm_move_into_folder to move VM to a new folder.

Part of ManageIQ/manageiq#17519.

https://bugzilla.redhat.com/show_bug.cgi?id=1090957

@miq-bot add_label gaprindashvili/no, enhancement

agrare · 2018-06-08T14:47:51Z

@lfu you'll need to update the refresh parsers to set the type as well

Fryguy · 2018-06-08T16:15:27Z

app/models/manageiq/providers/vmware/infra_manager/ems_folder.rb

@@ -0,0 +1,13 @@
+class ManageIQ::Providers::Vmware::InfraManager::EmsFolder < EmsFolder


@agrare Are we going to need a data migration for this new class? This will seriously break refresh if we don't, I think.

I think so. Working on it.

@Fryguy I think the existing folders will be found and have their type updated on the first refresh after upgrade without being destroyed but let me confirm that.

Ah never mind, forgot we .except the :type in save_inventory_with_findkey

I have to delete the existing folders then the refresher would add them back in with type populated. Seems the refresher does not update the existing ones.

@lfu yeah that's because of https://github.com/ManageIQ/manageiq/blob/master/app/models/ems_refresh/save_inventory_helper.rb#L101

agrare · 2018-06-14T15:21:38Z

@lfu there are a few methods in the base EmsFolder which are VMware only, can you move those into here?

https://github.com/ManageIQ/manageiq/blob/master/app/models/ems_folder.rb#L25-L33 and https://github.com/ManageIQ/manageiq/blob/master/app/models/ems_folder.rb#L121-L151

agrare · 2018-06-14T15:22:04Z

spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb

@@ -763,8 +763,7 @@ def assert_specific_vm
      :ems_ref_obj => VimString.new("group-d1", :Folder, :ManagedObjectReference),
      :uid_ems     => "group-d1",
      :name        => "Datacenters",
-      :type        => nil,
-
+      :type        => "ManageIQ::Providers::Vmware::InfraManager::EmsFolder",


Need to update to ...::InfraManager::Folder

agrare · 2018-06-14T15:22:09Z

spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb

@@ -773,8 +772,7 @@ def assert_specific_vm
      :ems_ref_obj => VimString.new("group-v11341", :Folder, :ManagedObjectReference),
      :uid_ems     => "group-v11341",
      :name        => "JFitzgerald",
-      :type        => nil,
-
+      :type        => "ManageIQ::Providers::Vmware::InfraManager::EmsFolder",


agrare · 2018-06-14T15:22:18Z

spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb

-      [EmsFolder, "Datacenters", {:hidden => true}] => {
-        [Datacenter, "Dev"]            => {
-          [EmsFolder, "host", {:hidden => true}] => {
+      [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Datacenters", {:hidden => true}] => {


Same on these

agrare · 2018-06-14T15:22:34Z

spec/models/miq_vim_broker_worker/runner_spec.rb

@@ -258,7 +258,7 @@

        it "will handle create events properly" do
          mor       = "group-v123"
-          klass     = "EmsFolder"
+          klass     = "ManageIQ::Providers::Vmware::InfraManager::EmsFolder"


agrare · 2018-06-14T15:40:56Z

@lfu couple of small things then this LGTM

lfu · 2018-06-14T16:07:21Z

Travis would fail due to the factory changes in ManageIQ/manageiq#17519.
This PR and ManageIQ/manageiq#17519 becomes dependent on each other.

agrare

👍 this passes for me locally with ManageIQ/manageiq#17519 applied

https://bugzilla.redhat.com/show_bug.cgi?id=1090957

miq-bot · 2018-06-19T19:34:16Z

Checked commit lfu@2ad3dc5 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. 👍

agrare · 2018-06-20T09:51:45Z

app/models/manageiq/providers/vmware/infra_manager.rb

@@ -249,6 +249,10 @@ def vm_relocate(vm, options = {})
      invoke_vim_ws(:relocateVM, vm, options[:user_event], options[:host], options[:pool], options[:datastore], options[:disk_move_type], options[:transform], options[:priority], options[:disk])
    end

+    def vm_move_into_folder(vm, options = {})
+      invoke_vim_ws(:moveIntoFolder, options[:folder], options[:user_event], vm.ems_ref_obj)


Is this right? :moveIntoFolder is defined on MiqVimFolder and takes just the managed object ems_ref_obj. The method on MiqVim is :moveIntoFolder_Task and takes a folder ref and a vm ref.

Can you do a live test of this end to end to make sure it works?

@agrare This has been end-to-end tested and it went well.
invoke_vim_ws would convert options[:folder] to MiqVimFolder and calls moveIntoFolder on it.

Oh sorry you're completely right

agrare

👍 LGTM

handle volume snapshot status changes

lfu mentioned this pull request Jun 8, 2018

Support moving a VM to another folder during VM Migrate. ManageIQ/manageiq#17519

Merged

miq-bot added enhancement gaprindashvili/no labels Jun 8, 2018

lfu force-pushed the vm_move_folder_1090957 branch from ee5f597 to 2b78398 Compare June 8, 2018 15:56

Fryguy requested changes Jun 8, 2018

View reviewed changes

lfu force-pushed the vm_move_folder_1090957 branch 4 times, most recently from 639a52e to 0a48372 Compare June 11, 2018 18:03

gmcculloug assigned agrare Jun 13, 2018

agrare mentioned this pull request Jun 13, 2018

Add VMware folder types. ManageIQ/manageiq-schema#219

Closed

lfu force-pushed the vm_move_folder_1090957 branch from 0a48372 to 7ec9aa3 Compare June 14, 2018 15:00

agrare reviewed Jun 14, 2018

View reviewed changes

lfu changed the title ~~Add EmsFolder class to VMware provider.~~ Add Folder class to VMware provider. Jun 14, 2018

lfu force-pushed the vm_move_folder_1090957 branch from 7ec9aa3 to c8c60e9 Compare June 14, 2018 16:05

lfu force-pushed the vm_move_folder_1090957 branch 2 times, most recently from 79023fb to 49396d7 Compare June 14, 2018 17:58

agrare approved these changes Jun 14, 2018

View reviewed changes

Add vm_move_into_folder method.

2ad3dc5

https://bugzilla.redhat.com/show_bug.cgi?id=1090957

lfu force-pushed the vm_move_folder_1090957 branch from 49396d7 to 2ad3dc5 Compare June 19, 2018 19:28

lfu changed the title ~~Add Folder class to VMware provider.~~ Add method vm_move_into_folder. Jun 19, 2018

agrare reviewed Jun 20, 2018

View reviewed changes

agrare approved these changes Jun 20, 2018

View reviewed changes

agrare merged commit 9fd3c24 into ManageIQ:master Jun 20, 2018

agrare added this to the Sprint 89 Ending Jul 2, 2018 milestone Jun 20, 2018

lfu deleted the vm_move_folder_1090957 branch September 29, 2018 14:35

agrare pushed a commit to agrare/manageiq-providers-vmware that referenced this pull request Apr 15, 2019

Merge pull request ManageIQ#285 from AlexanderZagaynov/BZ-1561937

3951c8b

handle volume snapshot status changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add method vm_move_into_folder. #285

Add method vm_move_into_folder. #285

lfu commented Jun 8, 2018 •

edited

Loading

agrare commented Jun 8, 2018

Fryguy Jun 8, 2018

lfu Jun 8, 2018

agrare Jun 8, 2018

agrare Jun 8, 2018

lfu Jun 8, 2018

agrare Jun 8, 2018

agrare commented Jun 14, 2018

agrare Jun 14, 2018

agrare Jun 14, 2018

agrare Jun 14, 2018

agrare Jun 14, 2018

agrare commented Jun 14, 2018

lfu commented Jun 14, 2018

agrare left a comment

miq-bot commented Jun 19, 2018

agrare Jun 20, 2018

lfu Jun 20, 2018

agrare Jun 20, 2018

agrare left a comment

		@@ -0,0 +1,13 @@
		class ManageIQ::Providers::Vmware::InfraManager::EmsFolder < EmsFolder

Add method vm_move_into_folder. #285

Add method vm_move_into_folder. #285

Conversation

lfu commented Jun 8, 2018 • edited Loading

agrare commented Jun 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

agrare commented Jun 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

agrare commented Jun 14, 2018

lfu commented Jun 14, 2018

agrare left a comment

Choose a reason for hiding this comment

miq-bot commented Jun 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

agrare left a comment

Choose a reason for hiding this comment

lfu commented Jun 8, 2018 •

edited

Loading