From e374ff4be4368b6347ef16ef2f40c69b44fbe280 Mon Sep 17 00:00:00 2001 From: Gabriel Robitaille-Montpetit Date: Mon, 30 Mar 2015 14:01:04 -0400 Subject: [PATCH] Added trunks code to go with the model. Change-Id: I514f8d8ad7d786901061b14909735cee9bb412f6 Signed-off-by: Gabriel Robitaille-Montpetit --- .../integrationtest/schema/openvswitch/OpenVSwitchIT.java | 3 ++- .../openstack/netvirt/impl/TenantNetworkManagerImpl.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java index e98074cc48..d3f99f1a00 100644 --- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java +++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java @@ -933,9 +933,10 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase { String portUuidStr = "testPort"; String intfUuidStr = "testIntf"; String tunnelEncap = "vxlan"; + int tag = 10; Port port = getClient().createTypedRowWrapper(Port.class); port.setName("testPort"); - port.setTag(ImmutableSet.of(1L)); + port.setTag(tag); port.setMac(ImmutableSet.of("00:00:00:00:00:01")); port.setInterfaces(ImmutableSet.of(new UUID(intfUuidStr))); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java index 00680427a3..dbbfb2f1bc 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java @@ -75,9 +75,7 @@ public class TenantNetworkManagerImpl implements TenantNetworkManager { } Port port = ovsdbConfigurationService.createTypedRow(node, Port.class); - OvsdbSet tags = new OvsdbSet<>(); - tags.add((long) vlan); - port.setTag(tags); + port.setTag(vlan); ovsdbConfigurationService.updateRow(node, port.getSchema().getName(), null, portUUID, port.getRow()); } -- 2.36.6