Reconfigure VM: Add / Remove Network Adapters #3121

kruge002 · 2017-12-20T13:53:00Z

This PR adds a new feature to the 'Reconfigure VM' webpage: Add / Remove Network Adapters.

This PR is part of a set of PRs:
ManageIQ/vmware_web_service#25
ManageIQ/manageiq-providers-vmware#163
ManageIQ/manageiq#16700
#3121

Issue #3119 describes the lack of support for adding or removing network adapters at the Reconfigure VM webpage. There are some screenshots and a link to the four PRs implementing this new functionality.

kruge002 · 2018-01-03T14:38:28Z

Scrutinizer: the remaining issues are informational issues. These so called code duplications can hardly be called duplications because the code fragments are very different.
Codeclimate: Cognitive Complexity of 6 (exceeds 5 allowed). Please disregard this.
Travis CI build failed: Some tests failed because this PR depends on other PRs two of which are not yet merged: Reconfigure VM: Add / Remove Network Adapters manageiq-providers-vmware#163 Reconfigure VM: Add / Remove Network Adapters manageiq#16700

miq-bot · 2018-02-14T13:44:09Z

This pull request is not mergeable. Please rebase and repush.

kruge002 · 2018-02-19T12:46:14Z

Please disregard the remaining 3 codeclimate issues: Cognitive Complexity of 6 (exceeds 5) and two similar blocks of code not suitable for refactoring.

agrare · 2018-02-19T15:18:57Z

@miq-bot remove-label pending core

Tested the UI changes while testing ManageIQ/manageiq-providers-vmware#163 👍

agrare · 2018-02-19T15:19:19Z

cc @dclarizio @h-kataria

himdel · 2018-02-20T14:31:05Z

app/assets/javascripts/controllers/reconfigure/reconfigure_form_controller.js

@@ -61,6 +65,20 @@ ManageIQ.angular.app.controller('reconfigureFormController', ['$http', '$scope',
    vm.reconfigureModel.enableAddDiskButton = (nrDisksAfterReconfigure < 4);
  };

+  vm.setEnableAddNetworkAdapterButton = function() {
+    var nrNetworksAfterReconfigure = 0;
+    angular.forEach(vm.reconfigureModel.vmNetworkAdapters, function(network) {


var nrNetworksAfterReconfigure = _.reject(vm.reconfigureModel.vmNetworkAdapters, { add_remove: 'remove' }).length;

?

(Unless the switch is meaningful here..)

@himdel Good refactoring suggestion. Thanks.

himdel · 2018-02-20T14:34:37Z

app/controllers/mixins/actions/vm_actions/reconfigure.rb

+
+          # determine available switches for this host...
+          switch_ids = []
+          HostSwitch.where("host_id = ?", host_id).each do |host_switch|


Missing RBAC? (And with Lan.where)

@himdel Could you elaborate on that?

@himdel Do you mean add filter_by_tags as in miq_provision_virt_workflow.rb ?

Sure, sorry.. I think you need Rbac.filtered( HostSwitch.where("host_id = ?", host_id) ).each to filter this only to the switches the user is allowed to see..

himdel · 2018-02-20T14:34:45Z

app/controllers/mixins/actions/vm_actions/reconfigure.rb

+            vm = @reconfigureitems.first
+
+            vm.hardware.guest_devices.order(:device_name => 'asc').each do |guest_device|
+              lan = Lan.find_by(:id => guest_device.lan_id)


@himdel Is rbac necessary for lans that are already connected to the vm? Should the vm owner be blocked removing a non accessible lan from his vm?

Oh, you're right, here it makes less sense, never mind :).

(But if you wanted to, it would be spelled find_record_with_rbac(Lan, guest_device.lan_id).)

himdel · 2018-02-20T14:36:18Z

app/assets/javascripts/controllers/reconfigure/reconfigure_form_controller.js

+  vm.processAddSelectedNetwork = function() {
+    vm.reconfigureModel.vmNetworkAdapters.push(
+      {
+        name: 'to be determined',


missing i18n? (and for mac)

Good point. I will change it into name: __('to be determined')

kruge002 · 2018-02-22T16:30:48Z

app/assets/javascripts/controllers/reconfigure/reconfigure_form_controller.js

@@ -211,6 +291,8 @@ ManageIQ.angular.app.controller('reconfigureFormController', ['$http', '$scope',
      add_remove: 'add'});
    vm.resetAddValues();
    vm.updateDisksAddRemove();
+
+    vm.cb_disks = vm.reconfigureModel.vmAddDisks.length > 0  || vm.reconfigureModel.vmRemoveDisks.length > 0;


I inadvertantly messed with cb_disks. I will remove line 295 and 334 from my PR.

kruge002 · 2018-02-22T16:33:20Z

app/assets/javascripts/controllers/reconfigure/reconfigure_form_controller.js

+      {
+        name: 'to be determined',
+        vlan: vm.reconfigureModel.vLan_requested,
+        mac: 'not available yet',


I will change this into mac: __('not available yet'),

More info: #3119

miq-bot · 2018-02-28T15:19:28Z

Checked commits https://github.com/kruge002/manageiq-ui-classic/compare/215e9b45bcffea1fa97a8e0a5e0ae1ca96261364~...47ee5232e771e8fb02f46303576c0a481d6528d9 with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0
4 files checked, 1 offense detected

**

💣 💥 🔥 🚒 - Linter/Haml - Linter::Haml STDERR:

warning: parser/current is loading parser/ruby23, which recognizes
warning: 2.3.5-compliant syntax, but you are running 2.3.3.
warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.

kruge002 · 2018-03-01T10:14:09Z

Please retry the build. It timed out which happens ofter lately.

kruge002 · 2018-03-05T12:47:59Z

Please ignore the codeclimate issue: Method reconfigure has a Cognitive Complexity of 6 (exceeds 5 allowed).

agrare · 2018-03-13T12:25:33Z

ping @himdel @martinpovolny can you take another look?

kruge002 · 2018-03-22T14:16:54Z

@himdel Is there anything I should add or modify?

himdel · 2018-04-06T17:25:45Z

Very sorry for the delay @kruge002 , I think this looks good :)

simaishi · 2018-06-01T15:06:16Z

@himdel Can this be gaprindashvili/yes? ManageIQ/manageiq-providers-vmware#272 needs reconfigure network feature in G-branch..

himdel · 2018-06-01T15:19:19Z

I think so, yes, the UI side should be fine :) (but does need all the dependencies it seems)

Reconfigure VM: Add / Remove Network Adapters (cherry picked from commit c747bdd)

simaishi · 2018-06-01T16:15:49Z

Gaprindashvili backport details:

$ git log -1
commit d94caaa1c96d4b1b53e4bea43b387880c29542d3
Author: Martin Hradil <himdel@seznam.cz>
Date:   Fri Apr 6 19:29:10 2018 +0200

    Merge pull request #3121 from kruge002/ReconfigureNetwork
    
    Reconfigure VM: Add / Remove Network Adapters
    (cherry picked from commit c747bdd34527f1ebc734049039f55fe0207029ec)

mzazrivec added compute/infrastructure enhancement pending core labels Dec 21, 2017

miq-bot added unmergeable and removed unmergeable labels Feb 14, 2018

miq-bot removed the pending core label Feb 19, 2018

dclarizio assigned martinpovolny Feb 19, 2018

dclarizio requested a review from himdel February 19, 2018 19:14

himdel reviewed Feb 20, 2018

View reviewed changes

martinpovolny assigned himdel and unassigned martinpovolny Feb 20, 2018

kruge002 commented Feb 22, 2018

View reviewed changes

kruge002 added 4 commits February 28, 2018 11:44

Reconfigure VM: Add / Remove Network Adapters

215e9b4

More info: #3119

Fixed rubocop, haml-lint, yamllint, scrutinizer and codeclimate offenses

8fbaf47

Forcing build after dependent PRs have been merged

b65203c

Review comments processed

47ee523

himdel merged commit c747bdd into ManageIQ:master Apr 6, 2018

himdel added this to the Sprint 83 Ending Apr 9, 2018 milestone Apr 6, 2018

simaishi pushed a commit that referenced this pull request Jun 1, 2018

Merge pull request #3121 from kruge002/ReconfigureNetwork

d94caaa

Reconfigure VM: Add / Remove Network Adapters (cherry picked from commit c747bdd)

simaishi added blocker gaprindashvili/backported labels Jun 1, 2018

dayleparker mentioned this pull request Aug 1, 2018

Bz#1578239 reconfigure resize to gaprindashvili ManageIQ/manageiq-documentation#919

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reconfigure VM: Add / Remove Network Adapters #3121

Reconfigure VM: Add / Remove Network Adapters #3121

kruge002 commented Dec 20, 2017 •

edited

kruge002 commented Jan 3, 2018

miq-bot commented Feb 14, 2018

kruge002 commented Feb 19, 2018

agrare commented Feb 19, 2018

agrare commented Feb 19, 2018

himdel Feb 20, 2018 •

edited

kruge002 Feb 22, 2018

himdel Feb 20, 2018

kruge002 Feb 22, 2018

kruge002 Feb 26, 2018

himdel Feb 26, 2018

himdel Feb 20, 2018

kruge002 Feb 22, 2018

himdel Feb 26, 2018

himdel Feb 20, 2018

kruge002 Feb 22, 2018

kruge002 Feb 22, 2018

kruge002 Feb 22, 2018

miq-bot commented Feb 28, 2018

kruge002 commented Mar 1, 2018

kruge002 commented Mar 5, 2018

agrare commented Mar 13, 2018

kruge002 commented Mar 22, 2018

himdel commented Apr 6, 2018

simaishi commented Jun 1, 2018 •

edited

himdel commented Jun 1, 2018

simaishi commented Jun 1, 2018

Reconfigure VM: Add / Remove Network Adapters #3121

Reconfigure VM: Add / Remove Network Adapters #3121

Conversation

kruge002 commented Dec 20, 2017 • edited

kruge002 commented Jan 3, 2018

miq-bot commented Feb 14, 2018

kruge002 commented Feb 19, 2018

agrare commented Feb 19, 2018

agrare commented Feb 19, 2018

himdel Feb 20, 2018 • edited

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

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

Choose a reason for hiding this comment

miq-bot commented Feb 28, 2018

kruge002 commented Mar 1, 2018

kruge002 commented Mar 5, 2018

agrare commented Mar 13, 2018

kruge002 commented Mar 22, 2018

himdel commented Apr 6, 2018

simaishi commented Jun 1, 2018 • edited

himdel commented Jun 1, 2018

simaishi commented Jun 1, 2018

kruge002 commented Dec 20, 2017 •

edited

himdel Feb 20, 2018 •

edited

simaishi commented Jun 1, 2018 •

edited