From 9ad2bcf636af167948c814ad983a6ac18dac6bfc Mon Sep 17 00:00:00 2001 From: Xinran WANG Date: Mon, 30 Jul 2018 11:16:52 +0800 Subject: [PATCH] Change "type" to "interface_type" Since cyborg has added a new field "interface_type" to indicate the type of interface, os-acc should also change "type" to "interface_type". Change-Id: I112de865807effd8b385a6f7b3788e1b51f5ccd6 --- os_acc/__init__.py | 6 +++--- os_acc/pci.py | 2 +- os_acc/tests/unit/test_os_acc.py | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/os_acc/__init__.py b/os_acc/__init__.py index b12fa7b..16aa6e6 100644 --- a/os_acc/__init__.py +++ b/os_acc/__init__.py @@ -43,7 +43,7 @@ def get_config(acc, instance=None, inst_type=None): if _EXT_MANAGER is None: raise os_acc.exception.LibraryNotInitialized() - acc_type = acc['type'] + acc_type = acc['interface_type'] if acc_type is None: raise os_acc.exception.InternalError( _("acc_type parameter must be present " @@ -59,7 +59,7 @@ def get_config(acc, instance=None, inst_type=None): def attach(acc, guest=None, host=None, instance=None, inst_type=None): if _EXT_MANAGER is None: raise os_acc.exception.LibraryNotInitialized() - acc_type = acc['type'] + acc_type = acc['interface_type'] if acc_type is None: raise os_acc.exception.InternalError( _("acc_type parameter must be present " @@ -82,7 +82,7 @@ def detach(acc, guest=None, host=None, instance=None, inst_type=None): if _EXT_MANAGER is None: raise os_acc.exception.LibraryNotInitialized() - acc_type = acc['type'] + acc_type = acc['interface_type'] if acc_type is None: raise os_acc.exception.InternalError( _("acc_type parameter must be present " diff --git a/os_acc/pci.py b/os_acc/pci.py index d19a511..009b2b9 100644 --- a/os_acc/pci.py +++ b/os_acc/pci.py @@ -18,7 +18,7 @@ from os_acc import base class PciAccelerator(base.PluginBase): def get_config(self, acc, instance=None, inst_type=None): - pcie_addr = acc["pcie_address"] + pcie_addr = acc["address"] domain, bus, slot, func = self._get_pci_address_fields(pcie_addr) from nova.virt.libvirt.config import LibvirtConfigGuestHostdevPCI conf = LibvirtConfigGuestHostdevPCI() diff --git a/os_acc/tests/unit/test_os_acc.py b/os_acc/tests/unit/test_os_acc.py index 04ae7ca..27c1af2 100644 --- a/os_acc/tests/unit/test_os_acc.py +++ b/os_acc/tests/unit/test_os_acc.py @@ -113,9 +113,9 @@ class TestOSACC(base.TestCase): mock.patch('stevedore.extension.ExtensionManager.__getitem__', return_value=plg): os_acc.initialize() - fake_acc = {"instance_uuid": "", "type": "demo", + fake_acc = {"instance_uuid": "", "interface_type": "demo", "name": "NVIDIA Corporation GP100GL", - "pcie_address": "0000:81:00.0"} + "address": "0000:81:00.0"} fake_instance = {} fake_inst_type = {} fake_guest = "" @@ -137,9 +137,9 @@ class TestOSACC(base.TestCase): mock.patch('stevedore.extension.ExtensionManager.__getitem__', return_value=plg): os_acc.initialize() - fake_acc = {"instance_uuid": "", "type": "demo", + fake_acc = {"instance_uuid": "", "interface_type": "demo", "name": "NVIDIA Corporation GP100GL", - "pcie_address": "0000:81:00.0"} + "address": "0000:81:00.0"} fake_instance = {} fake_inst_type = {} os_acc.get_config(fake_acc, fake_instance, fake_inst_type) @@ -157,9 +157,9 @@ class TestOSACC(base.TestCase): mock.patch('stevedore.extension.ExtensionManager.__getitem__', return_value=plg): os_acc.initialize() - fake_acc = {"instance_uuid": "", "type": "demo", + fake_acc = {"instance_uuid": "", "interface_type": "demo", "name": "NVIDIA Corporation GP100GL", - "pcie_address": "0000:81:00.0"} + "address": "0000:81:00.0"} fake_instance = {} fake_inst_type = {} fake_guest = ""