From 987b0028e0cef495a7ae05639d95dbfbb835e12a Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Thu, 22 Jan 2015 04:07:50 -0600 Subject: [PATCH] Use ovsdb-api neutral column/value mappings The format ('column:field', 'value') for map-type ovsdb values is ovs-vsctl-specific. The updated implementation-neutral way to do this is ('column', {'field': 'value'}). Partially-Implements: blueprint vsctl-to-ovsdb Change-Id: Icc917c97963204c01e0e9054cdcb9d8ec60f6ec1 --- neutron/tests/functional/agent/test_ovs_lib.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/neutron/tests/functional/agent/test_ovs_lib.py b/neutron/tests/functional/agent/test_ovs_lib.py index 09c60ca62..89192e52f 100644 --- a/neutron/tests/functional/agent/test_ovs_lib.py +++ b/neutron/tests/functional/agent/test_ovs_lib.py @@ -39,11 +39,8 @@ class OVSBridgeTestCase(base.BaseOVSLinuxTestCase): iface_id = base.get_rand_name() if mac is None: mac = base.get_rand_name() - attrs = { - 'external_ids:%s' % iface_field: iface_id, - 'external_ids:attached-mac': mac - } - port_name, ofport = self.create_ovs_port(*attrs.items()) + attrs = ('external_ids', {iface_field: iface_id, 'attached-mac': mac}) + port_name, ofport = self.create_ovs_port(attrs) return ovs_lib.VifPort(port_name, ofport, iface_id, mac, self.br) def test_port_lifecycle(self): @@ -64,7 +61,7 @@ class OVSBridgeTestCase(base.BaseOVSLinuxTestCase): self.assertEqual('internal', self.br.db_get_val('Interface', port_name, 'type')) self.br.replace_port(port_name, ('type', 'internal'), - ('external_ids:test', 'test')) + ('external_ids', {'test': 'test'})) self.assertTrue(self.br.port_exists(port_name)) self.assertEqual('test', self.br.db_get_val('Interface', port_name, 'external_ids')['test']) @@ -81,7 +78,8 @@ class OVSBridgeTestCase(base.BaseOVSLinuxTestCase): def test_get_bridge_external_bridge_id(self): self.ovs.set_db_attribute('Bridge', self.br.br_name, - 'external_ids:bridge-id', self.br.br_name) + 'external_ids', + {'bridge-id': self.br.br_name}) self.assertEqual( self.br.br_name, self.ovs.get_bridge_external_bridge_id(self.br.br_name)) -- 2.45.2