Change in vdsm[master]: virt: drop remains of vm-level nicModel

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has uploaded a new change for review.

Change subject: virt: drop remains of vm-level nicModel
......................................................................

virt: drop remains of vm-level nicModel

Commit c264b600 has dropped the ancient support for vm-level nicModel.
However, some dead code remains.

Change-Id: I91cd86fc73806b89ce8dbe9e437bc9893b3a9639
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/api/vdsm-api.yml
M lib/vdsm/config.py.in
M tests/devices/parsing/complex_vm_tests.py
M tests/vmTestsData.py
M vdsm/API.py
5 files changed, 1 insertion(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/67165/1

diff --git a/lib/api/vdsm-api.yml b/lib/api/vdsm-api.yml
index 62ee76e..0f5d7e2 100644
--- a/lib/api/vdsm-api.yml
+++ b/lib/api/vdsm-api.yml
@@ -4055,11 +4055,6 @@
             name: maxVCpus
             type: uint
 
-        -   description: A comma-separated list of NIC models in use by the
-                VM
-            name: nicModel
-            type: string
-
         -   defaultvalue: qemu64
             description: The type of CPU being emulated special values
                 'hostPassthrough' and 'hostModel' are reserved for
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index de8bce5..f566c37 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -81,11 +81,6 @@
             'To apply options to a single interface, '
             'set ethtool_opts.iface_name.'),
 
-        ('nic_model', 'rtl8139,pv',
-            'NIC model is rtl8139, ne2k_pci pv or any other valid device '
-            'recognized by kvm/qemu if a coma separated list given then a '
-            'NIC per device will be created.'),
-
         ('migration_destination_timeout', '21600',
             'Maximum time the destination waits for the migration to finish.'),
 
diff --git a/tests/devices/parsing/complex_vm_tests.py
b/tests/devices/parsing/complex_vm_tests.py
index 04a26a4..647ecc8 100644
--- a/tests/devices/parsing/complex_vm_tests.py
+++ b/tests/devices/parsing/complex_vm_tests.py
@@ -64,7 +64,7 @@
 
     def test_sriov_vm(self):
         params = {
-            'nicModel': 'rtl8139,pv', 'name': 'SRiovVm',
+            'name': 'SRiovVm',
             'displaySecurePort': '-1', 'memSize': '256',
'displayPort': '-1',
             'display': 'qxl'}
 
diff --git a/tests/vmTestsData.py b/tests/vmTestsData.py
index ec20dd5..d078e08 100644
--- a/tests/vmTestsData.py
+++ b/tests/vmTestsData.py
@@ -359,7 +359,6 @@
     'maxVCpus': '16',
     'memGuaranteedSize': 16,
     'memSize': 16,
-    'nicModel': 'rtl8139,pv',
     'nice': '0',
     'pid': '0',
     'smartcardEnable': 'false',
diff --git a/vdsm/API.py b/vdsm/API.py
index 7bc5d27..67c64e7 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -243,8 +243,6 @@
                                                   ['status']['code'],
                                    'message': 'Unknown display type %s'
%
                                               vmParams.get('display')}}
-            if 'nicModel' not in vmParams:
-                vmParams['nicModel'] = config.get('vars',
'nic_model')
             return self._cif.createVm(vmParams)
 
         except OSError as e:


-- 
To view, visit https://gerrit.ovirt.org/67165
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91cd86fc73806b89ce8dbe9e437bc9893b3a9639
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has posted comments on this change.

Change subject: virt: drop remains of vm-level nicModel
......................................................................


Patch Set 1:

Piotr, as far as I understand the Engine code, all 3 sited locations refer to nicModel as
a parameter of a network interface device.

The code I'm removing now is different. In prehistoric times, Engine has attached a
coman-separated nicModel string to the VM object directly, instead of the current devices
structure.

-- 
To view, visit https://gerrit.ovirt.org/67165
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I91cd86fc73806b89ce8dbe9e437bc9893b3a9639
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has posted comments on this change.

Change subject: virt: drop remains of vm-level nicModel
......................................................................


Patch Set 1: Verified+1

verified that VMs start, migrate, and connected to network.

any Engine that depended on vm.nicModel are already unsupported as of commit c264b600.

-- 
To view, visit https://gerrit.ovirt.org/67165
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I91cd86fc73806b89ce8dbe9e437bc9893b3a9639
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has submitted this change and it was merged.

Change subject: virt: drop remains of vm-level nicModel
......................................................................


virt: drop remains of vm-level nicModel

Commit c264b600 has dropped the ancient support for vm-level nicModel.
However, some dead code remains.

Change-Id: I91cd86fc73806b89ce8dbe9e437bc9893b3a9639
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/api/vdsm-api.yml
M lib/vdsm/config.py.in
M tests/devices/parsing/complex_vm_tests.py
M tests/vmTestsData.py
M vdsm/API.py
5 files changed, 1 insertion(+), 14 deletions(-)

Approvals:
  Piotr Kliczewski: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Verified
  Francesco Romani: Looks good to me, approved



-- 
To view, visit https://gerrit.ovirt.org/67165
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I91cd86fc73806b89ce8dbe9e437bc9893b3a9639
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;