From 769e1ca9e9821a99c6ca0958a40110ee17da278e Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Wed, 4 Mar 2015 20:25:23 -0500 Subject: [PATCH] Migrate net-virt from adsal Node to mdsal Node Change-Id: I99e437d04e2dedf4f8cbe0b8059f7421177ecae6 Signed-off-by: Sam Hague --- commons/integrationtest/pom.xml | 4 ++ commons/parent/pom.xml | 10 +-- .../ovsdb/src/main/resources/features.xml | 2 - .../integrationtest/neutron/NeutronIT.java | 23 +++---- openstack/net-virt-providers/pom.xml | 6 +- .../netvirt/providers/Activator.java | 4 +- .../openflow13/AbstractServiceInstance.java | 12 ++-- .../providers/openflow13/OF13Provider.java | 25 +++---- .../services/ArpResponderService.java | 6 +- .../openflow13/services/EgressAclService.java | 2 +- .../services/InboundNatService.java | 6 +- .../services/IngressAclService.java | 2 +- .../services/L3ForwardingService.java | 6 +- .../services/LoadBalancerService.java | 8 ++- .../services/OutboundNatService.java | 6 +- .../openflow13/services/RoutingService.java | 6 +- openstack/net-virt/pom.xml | 2 +- .../openstack/netvirt/AbstractHandler.java | 4 +- .../ovsdb/openstack/netvirt/Activator.java | 6 +- .../netvirt/LBaaSPoolMemberHandler.java | 3 +- .../openstack/netvirt/NetworkHandler.java | 8 +-- .../ovsdb/openstack/netvirt/NodeUtils.java | 69 +++++++++++++++++++ .../ovsdb/openstack/netvirt/PortHandler.java | 8 +-- .../openstack/netvirt/SouthboundEvent.java | 2 +- .../openstack/netvirt/SouthboundHandler.java | 26 +++---- .../openstack/netvirt/api/ArpProvider.java | 4 +- .../api/BridgeConfigurationManager.java | 2 +- .../netvirt/api/ConfigurationService.java | 2 +- .../netvirt/api/EgressAclProvider.java | 2 +- .../netvirt/api/InboundNatProvider.java | 4 +- .../netvirt/api/IngressAclProvider.java | 2 +- .../netvirt/api/L3ForwardingProvider.java | 4 +- .../netvirt/api/LoadBalancerProvider.java | 2 +- .../netvirt/api/NetworkingProvider.java | 6 +- .../api/NetworkingProviderManager.java | 2 +- .../netvirt/api/OutboundNatProvider.java | 4 +- .../netvirt/api/RoutingProvider.java | 4 +- .../netvirt/api/TenantNetworkManager.java | 2 +- .../netvirt/api/VlanConfigurationCache.java | 2 +- .../impl/BridgeConfigurationManagerImpl.java | 12 ++-- .../impl/ConfigurationServiceImpl.java | 6 +- .../netvirt/impl/NeutronL3Adapter.java | 36 +++++----- .../impl/ProviderNetworkManagerImpl.java | 2 +- .../impl/TenantNetworkManagerImpl.java | 6 +- .../impl/VlanConfigurationCacheImpl.java | 4 +- .../BridgeConfigurationManagerImplTest.java | 5 +- 46 files changed, 223 insertions(+), 146 deletions(-) create mode 100644 openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NodeUtils.java diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml index 58cf3feab..3d1a9d176 100644 --- a/commons/integrationtest/pom.xml +++ b/commons/integrationtest/pom.xml @@ -688,6 +688,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb openstack.net-virt + + org.opendaylight.ovsdb + ovsdb-plugin-compatibility-layer + org.opendaylight.ovsdb plugin diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index c95f811a5..05f12d3e6 100755 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -308,6 +308,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html openstack.net-virt-providers ${openstack.netvirt.providers.version} + + org.opendaylight.ovsdb + ovsdb-plugin-compatibility-layer + ${ovsdb.plugin.compatibility.layer.version} + org.opendaylight.ovsdb plugin @@ -358,11 +363,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html powermock-core ${powermock.version} - - org.opendaylight.ovsdb - ovsdb-plugin-compatibility-layer - ${ovsdb.plugin.compatibility.layer.version} - diff --git a/features/ovsdb/src/main/resources/features.xml b/features/ovsdb/src/main/resources/features.xml index b7dd79214..9de097a9f 100644 --- a/features/ovsdb/src/main/resources/features.xml +++ b/features/ovsdb/src/main/resources/features.xml @@ -12,7 +12,6 @@ odl-ovsdb-library odl-ovsdb-plugin odl-ovsdb-northbound - odl-ovsdb-compatibility-layer @@ -61,7 +60,6 @@ odl-openflowplugin-flow-services odl-neutron-service odl-nsf-service - odl-ovsdb-compatibility-layer mvn:org.opendaylight.ovsdb/openstack.net-virt/${openstack.netvirt.version} mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/${openstack.netvirt.providers.version} diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java index 8ae8a716b..147f1f7f7 100644 --- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java +++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java @@ -17,9 +17,8 @@ import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.CoreOptions.propagateSystemProperty; import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.ovsdb.compatibility.plugin.api.NodeUtils; import org.opendaylight.ovsdb.integrationtest.ConfigurationBundles; import org.opendaylight.ovsdb.integrationtest.OvsdbIntegrationTestBase; import org.opendaylight.ovsdb.lib.notation.Row; @@ -156,7 +155,7 @@ public class NeutronIT extends OvsdbIntegrationTestBase { Thread.sleep(5000); // Create the integration bridge - bridgeConfigurationManager.prepareNode(NodeUtils.getSalNode(node)); + bridgeConfigurationManager.prepareNode(node); Map bridgeRows = @@ -166,7 +165,7 @@ public class NeutronIT extends OvsdbIntegrationTestBase { Bridge bridgeRow = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeRows.values().iterator().next()); Assert.assertEquals(netVirtConfigurationService.getIntegrationBridgeName(), bridgeRow.getName()); - String uuid = bridgeConfigurationManager.getBridgeUuid(NodeUtils.getSalNode(node), + String uuid = bridgeConfigurationManager.getBridgeUuid(node, netVirtConfigurationService.getIntegrationBridgeName()); Assert.assertEquals(uuid, bridgeRow.getUuid().toString()); @@ -185,7 +184,7 @@ public class NeutronIT extends OvsdbIntegrationTestBase { OpenVSwitch.class, ovsRows.values().iterator().next()); - Assert.assertEquals(null, netVirtConfigurationService.getTunnelEndPoint(NodeUtils.getSalNode(node))); + Assert.assertEquals(null, netVirtConfigurationService.getTunnelEndPoint(node)); final UUID originalVersion = ovsRow.getVersion(); OpenVSwitch updateOvsRow = ovsdbConfigurationService.createTypedRow(node, OpenVSwitch.class); @@ -205,7 +204,7 @@ public class NeutronIT extends OvsdbIntegrationTestBase { // Make sure tunnel end point was set Assert.assertEquals(InetAddress.getByName(endpointAddress), - netVirtConfigurationService.getTunnelEndPoint(NodeUtils.getSalNode(node))); + netVirtConfigurationService.getTunnelEndPoint(node)); // Fetch rows again, and compare tunnel end point values ovsRows = ovsdbConfigurationService.getRows(node, @@ -228,7 +227,7 @@ public class NeutronIT extends OvsdbIntegrationTestBase { Version ovsVersion = this.getOvsVersion(); if (ovsVersion.compareTo(Constants.OPENFLOW13_SUPPORTED) >= 0) { Assert.assertEquals(Constants.OPENFLOW13, - netVirtConfigurationService.getOpenflowVersion(NodeUtils.getSalNode(node))); + netVirtConfigurationService.getOpenflowVersion(node)); } } @@ -236,7 +235,7 @@ public class NeutronIT extends OvsdbIntegrationTestBase { public void testGetDefaultGatewayMacAddress() throws Exception { // Thread.sleep(5000); String defaultGatewayMacAddress = netVirtConfigurationService. - getDefaultGatewayMacAddress(NodeUtils.getSalNode(node)); + getDefaultGatewayMacAddress(node); if (defaultGatewayMacAddress != null) { String[] splits = defaultGatewayMacAddress.split(":"); @@ -251,7 +250,7 @@ public class NeutronIT extends OvsdbIntegrationTestBase { if (tearDownBridge) { try { - String uuid = bridgeConfigurationManager.getBridgeUuid(NodeUtils.getSalNode(node), + String uuid = bridgeConfigurationManager.getBridgeUuid(node, netVirtConfigurationService.getIntegrationBridgeName()); ovsdbConfigurationService.deleteRow(node, ovsdbConfigurationService.getTableName(node, Bridge.class), uuid); } catch (Exception e) { @@ -312,19 +311,19 @@ public class NeutronIT extends OvsdbIntegrationTestBase { @Override public Status handleInterfaceUpdate(NeutronNetwork network, - org.opendaylight.controller.sal.core.Node source, Interface intf) { + Node source, Interface intf) { return null; } @Override public Status handleInterfaceDelete(String tunnelType, NeutronNetwork network, - org.opendaylight.controller.sal.core.Node source, Interface intf, + Node source, Interface intf, boolean isLastInstanceOnNode) { return null; } @Override - public void initializeFlowRules(org.opendaylight.controller.sal.core.Node node) { + public void initializeFlowRules(Node node) { } diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml index 36cc29ed7..ac550b3b3 100644 --- a/openstack/net-virt-providers/pom.xml +++ b/openstack/net-virt-providers/pom.xml @@ -84,7 +84,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb - ovsdb-plugin-compatibility-layer + plugin org.opendaylight.ovsdb @@ -126,7 +126,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html true - + utils.config,utils.mdsal-openflow;type=!pom;inline=false true org.opendaylight.ovsdb.openstack.netvirt.providers.Activator diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java index c32bdf78e..73cc7c194 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java @@ -47,8 +47,8 @@ import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.L3 import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.LoadBalancerService; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.OutboundNatService; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.RoutingService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; import org.osgi.framework.BundleContext; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/AbstractServiceInstance.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/AbstractServiceInstance.java index 0843f12fa..b13024ee8 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/AbstractServiceInstance.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/AbstractServiceInstance.java @@ -23,8 +23,8 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile import org.opendaylight.controller.sal.utils.HexEncode; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; @@ -41,6 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -87,9 +88,9 @@ public abstract class AbstractServiceInstance { } private String getBridgeName(String nodeId){ - List ovsNodes = connectionService.getNodes(); + List ovsNodes = connectionService.getNodes(); - for (org.opendaylight.controller.sal.core.Node ovsNode : ovsNodes) { + for (Node ovsNode : ovsNodes) { Map bridges = ovsdbConfigService.getRows(ovsNode, ovsdbConfigService.getTableName(ovsNode, Bridge.class)); if (bridges == null) continue; for (String brUuid : bridges.keySet()) { @@ -101,7 +102,8 @@ public abstract class AbstractServiceInstance { logger.debug("getBridgeName: bridgeDpid {} ofNodeDpid {}", bridge.getDatapathIdColumn().getData().toArray()[0], nodeId); if (dpid.equals(Long.parseLong(nodeId))){ // Found the bridge - logger.debug("getOvsNode: found ovsNode {} bridge {} for ofNode {}", ovsNode.getNodeIDString(), bridge.getName(), nodeId); + logger.debug("getOvsNode: found ovsNode {} bridge {} for ofNode {}", + ovsNode.getId().getValue(), bridge.getName(), nodeId); return bridge.getName(); } } diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java index 9ab584e14..a01217125 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java @@ -23,10 +23,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.neutron.spi.NeutronNetwork; import org.opendaylight.neutron.spi.NeutronSecurityGroup; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.utils.HexEncode; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler; @@ -40,11 +37,11 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.L2ForwardingProvider; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider; import org.opendaylight.ovsdb.openstack.netvirt.api.SecurityServicesManager; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; -import org.opendaylight.ovsdb.compatibility.plugin.api.StatusWithUuid; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; +import org.opendaylight.ovsdb.plugin.api.StatusWithUuid; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; @@ -88,6 +85,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -997,7 +995,8 @@ public class OF13Provider implements NetworkingProvider { if (!local) { programRemoteEgressTunnelBridgeRules(node, dpid, segmentationId, attachedMac, tunnelOFPort, localPort); } - logger.trace("program local ingress tunnel rules: node" + node.getNodeIDString() + " intf " + intf.getName()); + logger.trace("program local ingress tunnel rules: node" + + node.getId().getValue() + " intf " + intf.getName()); if (local) { programLocalIngressTunnelBridgeRules(node, dpid, segmentationId, attachedMac, tunnelOFPort, localPort); } @@ -1315,10 +1314,12 @@ public class OF13Provider implements NetworkingProvider { InetAddress src = configurationService.getTunnelEndPoint(srcNode); InetAddress dst = configurationService.getTunnelEndPoint(dstNode); if ((src != null) && (dst != null)) { - logger.info("Remove tunnel rules for interface " + intf.getName() + " on srcNode " + srcNode.getNodeIDString()); + logger.info("Remove tunnel rules for interface " + + intf.getName() + " on srcNode " + srcNode.getId().getValue()); this.removeTunnelRules(tunnelType, network.getProviderSegmentationID(), dst, srcNode, intf, true, isLastInstanceOnNode); - logger.info("Remove tunnel rules for interface " + intf.getName() + " on dstNode " + dstNode.getNodeIDString()); + logger.info("Remove tunnel rules for interface " + + intf.getName() + " on dstNode " + dstNode.getId().getValue()); this.removeTunnelRules(tunnelType, network.getProviderSegmentationID(), src, dstNode, intf, false, isLastInstanceOnNode); } else { @@ -2110,7 +2111,7 @@ public class OF13Provider implements NetworkingProvider { } @Override - public void initializeOFFlowRules(Node openflowNode) { + public void initializeOFFlowRules(org.opendaylight.controller.sal.core.Node openflowNode) { Preconditions.checkNotNull(connectionService); List ovsNodes = connectionService.getNodes(); if (ovsNodes == null) return; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java index 1d8c5b0a1..207383e6e 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java @@ -13,15 +13,14 @@ import java.math.BigInteger; import java.net.InetAddress; import java.util.List; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.ArpProvider; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.OF13Provider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.Service; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.utils.mdsal.openflow.ActionUtils; import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; @@ -39,6 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.EtherType; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java index 067db9e18..a7803d2f2 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java @@ -14,7 +14,6 @@ import java.util.List; import org.opendaylight.neutron.spi.NeutronSecurityGroup; import org.opendaylight.neutron.spi.NeutronSecurityRule; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.EgressAclProvider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; @@ -32,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.M import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatService.java index 887cec597..fd57d0b9d 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatService.java @@ -13,15 +13,14 @@ import java.math.BigInteger; import java.net.InetAddress; import java.util.List; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.InboundNatProvider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.OF13Provider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.Service; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils; import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; @@ -33,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.M import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import com.google.common.collect.Lists; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclService.java index ad411aecb..3ccdead9a 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclService.java @@ -14,7 +14,6 @@ import java.util.List; import org.opendaylight.neutron.spi.NeutronSecurityGroup; import org.opendaylight.neutron.spi.NeutronSecurityRule; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.IngressAclProvider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; @@ -32,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.M import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3ForwardingService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3ForwardingService.java index c5ac57557..b768c7f0a 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3ForwardingService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3ForwardingService.java @@ -14,15 +14,14 @@ import java.math.BigInteger; import java.net.InetAddress; import java.util.List; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.L3ForwardingProvider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.OF13Provider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.Service; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils; import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; @@ -35,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.M import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import com.google.common.collect.Lists; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/LoadBalancerService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/LoadBalancerService.java index 4114fa735..47434b23b 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/LoadBalancerService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/LoadBalancerService.java @@ -15,8 +15,6 @@ import java.util.Map; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.Node.NodeIDType; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration; @@ -24,6 +22,8 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.Lo import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.Service; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.utils.mdsal.openflow.ActionUtils; import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; @@ -57,6 +57,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; + public class LoadBalancerService extends AbstractServiceInstance implements LoadBalancerProvider { private static final Logger logger = LoggerFactory.getLogger(LoadBalancerProvider.class); @@ -100,7 +101,8 @@ public class LoadBalancerService extends AbstractServiceInstance implements Load action, member.getIP(), member.getIndex(), lbConfig.getVip(), lbConfig.getMembers().size()); NodeBuilder nodeBuilder = new NodeBuilder(); - nodeBuilder.setId(new NodeId(Constants.OPENFLOW_NODE_PREFIX + String.valueOf(node.getID()))); + nodeBuilder.setId(new NodeId(Constants.OPENFLOW_NODE_PREFIX + + String.valueOf(node.getID()))); nodeBuilder.setKey(new NodeKey(nodeBuilder.getId())); //Update the multipath rule diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatService.java index d7f6e197d..6177958c7 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatService.java @@ -14,15 +14,14 @@ import java.math.BigInteger; import java.net.InetAddress; import java.util.List; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.OutboundNatProvider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.OF13Provider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.Service; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils; import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; @@ -34,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.M import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import com.google.common.collect.Lists; diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingService.java index 677746e45..f9bbd0625 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingService.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingService.java @@ -14,15 +14,14 @@ import java.math.BigInteger; import java.net.InetAddress; import java.util.List; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.RoutingProvider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.OF13Provider; import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.Service; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.utils.mdsal.openflow.ActionUtils; import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; @@ -39,6 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import com.google.common.collect.Lists; diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml index 3fb3a50e6..9f5f3d435 100644 --- a/openstack/net-virt/pom.xml +++ b/openstack/net-virt/pom.xml @@ -61,7 +61,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb - ovsdb-plugin-compatibility-layer + plugin org.opendaylight.ovsdb diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java index 36969bb9d..2283bc7b2 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java @@ -9,8 +9,8 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher; import com.google.common.base.Preconditions; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java index 6d7563e47..75f704138 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java @@ -60,9 +60,9 @@ import org.opendaylight.ovsdb.openstack.netvirt.impl.ProviderNetworkManagerImpl; import org.opendaylight.ovsdb.openstack.netvirt.impl.SecurityServicesImpl; import org.opendaylight.ovsdb.openstack.netvirt.impl.TenantNetworkManagerImpl; import org.opendaylight.ovsdb.openstack.netvirt.impl.VlanConfigurationCacheImpl; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbInventoryListener; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener; import org.osgi.framework.BundleContext; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java index 04351d740..9b575b76a 100755 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java @@ -86,7 +86,8 @@ public class LBaaSPoolMemberHandler extends AbstractHandler logger.debug("Noop with LB pool member {} creation because no nodes available.", neutronLBPoolMember.getPoolMemberID()); } else { for (Node node: this.switchManager.getNodes()) - loadBalancerProvider.programLoadBalancerPoolMemberRules(node, lbConfig, + loadBalancerProvider.programLoadBalancerPoolMemberRules(node, + lbConfig, lbConfig.getMembers().get(neutronLBPoolMember.getPoolMemberID()), Action.ADD); } } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java index a21e0a787..37afc7fc6 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java @@ -12,7 +12,6 @@ package org.opendaylight.ovsdb.openstack.netvirt; import org.opendaylight.neutron.spi.INeutronNetworkAware; import org.opendaylight.neutron.spi.INeutronNetworkCRUD; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; @@ -20,11 +19,12 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager; import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbInventoryListener; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NodeUtils.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NodeUtils.java new file mode 100644 index 000000000..51117f271 --- /dev/null +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NodeUtils.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2015 Red Hat, Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Authors : Sam Hague + */ +package org.opendaylight.ovsdb.openstack.netvirt; + +import java.util.ArrayList; +import java.util.List; +import org.opendaylight.controller.sal.core.ConstructionException; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class NodeUtils { + protected static final Logger LOG = LoggerFactory.getLogger(NodeUtils.class); + + public static String getId (String identifier) { + String id = identifier; + + String[] pair = identifier.split("\\|"); + if (pair[0].equals("OVS")) { + id = pair[1]; + } + return id; + } + + public static Node getMdsalNode (org.opendaylight.controller.sal.core.Node salNode) { + String identifier = salNode.getNodeIDString(); + + NodeId nodeId = new NodeId("OVS" + "|" + identifier); + NodeKey nodeKey = new NodeKey(nodeId); + Node node = new NodeBuilder() + .setId(nodeId) + .setKey(nodeKey) + .build(); + + return node; + } + + public static org.opendaylight.controller.sal.core.Node getSalNode (Node mdsalNode) { + String identifier = NodeUtils.getId(mdsalNode.getId().getValue()); + org.opendaylight.controller.sal.core.Node node = null; + + try { + node = new org.opendaylight.controller.sal.core.Node("OVS", identifier); + } catch (ConstructionException e) { + LOG.error("Failed to allocate sal Node", e); + } + + return node; + } + + public static List getSalNodes (List mdsalNodes) { + List nodes = new ArrayList<>(); + + for (Node mdsalNode : mdsalNodes) { + nodes.add(NodeUtils.getSalNode(mdsalNode)); + } + return nodes; + } +} diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java index 1d55cb33c..b7add8276 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java @@ -11,17 +11,17 @@ package org.opendaylight.ovsdb.openstack.netvirt; import org.opendaylight.neutron.spi.INeutronPortAware; import org.opendaylight.neutron.spi.NeutronPort; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbInventoryListener; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundEvent.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundEvent.java index b2c47e14d..89a743f3a 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundEvent.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundEvent.java @@ -9,9 +9,9 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; public class SouthboundEvent extends AbstractEvent { public enum Type { NODE, ROW } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java index 9d6123507..9e1a7653f 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java @@ -9,12 +9,11 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; -import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.NodeConnector; import org.opendaylight.controller.sal.core.Property; import org.opendaylight.controller.sal.core.UpdateType; import org.opendaylight.controller.switchmanager.IInventoryListener; +import org.opendaylight.neutron.spi.NeutronNetwork; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; @@ -23,12 +22,13 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbInventoryListener; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import com.google.common.collect.Lists; import org.slf4j.Logger; @@ -44,7 +44,7 @@ public class SouthboundHandler extends AbstractHandler implements OvsdbInventory IInventoryListener { static final Logger logger = LoggerFactory.getLogger(SouthboundHandler.class); //private Thread eventThread; - List nodeCache; + List nodeCache; // The implementation for each of these services is resolved by the OSGi Service Manager private volatile ConfigurationService configurationService; @@ -296,15 +296,17 @@ public class SouthboundHandler extends AbstractHandler implements OvsdbInventory } @Override - public void notifyNode(Node node, UpdateType type, Map propMap) { - logger.debug("notifyNode: Node {} update {} from Controller's inventory Service", node, type); + public void notifyNode(org.opendaylight.controller.sal.core.Node openFlowNode, + UpdateType type, Map propMap) { + logger.debug("notifyNode: Node {} update {} from Controller's inventory Service", openFlowNode, type); // Add the Node Type check back once the Consistency issue is resolved between MD-SAL and AD-SAL - if (!type.equals(UpdateType.REMOVED) && !nodeCache.contains(node)) { - nodeCache.add(node); - networkingProviderManager.getProvider(node).initializeOFFlowRules(node); + if (!type.equals(UpdateType.REMOVED) && !nodeCache.contains(openFlowNode)) { + nodeCache.add(openFlowNode); + networkingProviderManager.getProvider(NodeUtils.getMdsalNode(openFlowNode)) + .initializeOFFlowRules(openFlowNode); } else if (type.equals(UpdateType.REMOVED)){ - nodeCache.remove(node); + nodeCache.remove(openFlowNode); } } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ArpProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ArpProvider.java index 2ab6b511d..4637e3d20 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ArpProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ArpProvider.java @@ -10,8 +10,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import java.net.InetAddress; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/BridgeConfigurationManager.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/BridgeConfigurationManager.java index 0883a8945..73f8d6a34 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/BridgeConfigurationManager.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/BridgeConfigurationManager.java @@ -11,8 +11,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import java.util.List; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ConfigurationService.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ConfigurationService.java index ff946e57f..8dd66e370 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ConfigurationService.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/ConfigurationService.java @@ -10,7 +10,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.apache.commons.lang3.tuple.Pair; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java index 14d0e6ae0..bfd1c978d 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java @@ -1,7 +1,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronSecurityGroup; -import org.opendaylight.controller.sal.core.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * This interface allows egress Port Security flows to be written to devices diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/InboundNatProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/InboundNatProvider.java index 7cde041dc..4ba2e8ca6 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/InboundNatProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/InboundNatProvider.java @@ -10,8 +10,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import java.net.InetAddress; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java index 36fc93d01..f4a4f3e66 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java @@ -10,7 +10,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronSecurityGroup; -import org.opendaylight.controller.sal.core.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * This interface allows ingress Port Security flows to be written to devices diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/L3ForwardingProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/L3ForwardingProvider.java index b410cabee..85928a5d8 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/L3ForwardingProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/L3ForwardingProvider.java @@ -10,8 +10,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import java.net.InetAddress; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerProvider.java index fe214d6d4..1e854a5fa 100755 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerProvider.java @@ -11,7 +11,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.LoadBalancerPoolMember; /** diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProvider.java index ee56e5554..bec4ec12f 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProvider.java @@ -11,9 +11,9 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; import org.opendaylight.ovsdb.schema.openvswitch.Interface; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * The NetworkingProvider interface is implemented by Neutron Networking Providers @@ -61,6 +61,6 @@ public interface NetworkingProvider { /** * Initialize the Flow rules for a given OpenFlow node */ - public void initializeOFFlowRules(Node openflowNode); + public void initializeOFFlowRules(org.opendaylight.controller.sal.core.Node openflowNode); } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProviderManager.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProviderManager.java index a1d6ac773..19be7ab2e 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProviderManager.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProviderManager.java @@ -10,7 +10,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * The NetworkingProviderManager handles the mapping between {@link org.opendaylight.controller.sal.core.Node} diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OutboundNatProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OutboundNatProvider.java index e278a025b..d12cedbfc 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OutboundNatProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OutboundNatProvider.java @@ -10,8 +10,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import java.net.InetAddress; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/RoutingProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/RoutingProvider.java index 0903bbbc4..62bad2ba5 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/RoutingProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/RoutingProvider.java @@ -10,8 +10,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import java.net.InetAddress; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java index 99fa49f84..e22472d7d 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java @@ -11,8 +11,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.schema.openvswitch.Interface; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * Open vSwitch isolates Tenant Networks using VLANs on the Integration Bridge diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java index 72822ab5e..83497bf4d 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java @@ -10,7 +10,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.controller.sal.core.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * This cache stores the VLAN assignments used for tenant separation within a vSwitch diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java index d79eb04d0..288eab2b9 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java @@ -10,9 +10,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.impl; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.controller.sal.core.Node; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.lib.error.SchemaVersionMismatchException; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; @@ -21,14 +18,15 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager; import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; -import org.opendaylight.ovsdb.compatibility.plugin.api.StatusWithUuid; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; +import org.opendaylight.ovsdb.plugin.api.StatusWithUuid; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java index dbf8e6c9a..c44deafbe 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java @@ -14,13 +14,13 @@ import java.util.Map; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch; import org.opendaylight.ovsdb.utils.config.ConfigProperties; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -178,7 +178,7 @@ public class ConfigurationServiceImpl implements ConfigurationService { public String getDefaultGatewayMacAddress(Node node) { final String l3gatewayForNode = node != null ? - ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac." + node.getNodeIDString()) : null; + ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac." + node.getId().getValue()) : null; return l3gatewayForNode != null ? l3gatewayForNode : ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac"); } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java index 1d6f2922f..d498119b8 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java @@ -20,18 +20,17 @@ import org.opendaylight.neutron.spi.NeutronRouter; import org.opendaylight.neutron.spi.NeutronRouter_Interface; import org.opendaylight.neutron.spi.NeutronSubnet; import org.opendaylight.neutron.spi.Neutron_IPs; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.utils.HexEncode; -import org.opendaylight.controller.sal.utils.Status; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.MultiTenantAwareRouter; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.Status; +import org.opendaylight.ovsdb.plugin.api.StatusCode; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.ArpProvider; @@ -41,6 +40,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.OutboundNatProvider; import org.opendaylight.ovsdb.openstack.netvirt.api.RoutingProvider; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.utils.config.ConfigProperties; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import com.google.common.base.Preconditions; import org.slf4j.Logger; @@ -313,12 +313,12 @@ public class NeutronL3Adapter { if (actionForNode == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programL3ForwardingStage1 for node {} providerId {} mac {} ip {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); return; } if (actionForNode == Action.ADD && isProgrammed == Boolean.TRUE) { logger.trace("programL3ForwardingStage1 for node {} providerId {} mac {} ip {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); return; } @@ -414,7 +414,7 @@ public class NeutronL3Adapter { final String ipStr = neutronIP.getIpAddress(); if (ipStr.isEmpty()) { logger.debug("programFlowsForNeutronRouterInterface is skipping node {} ip {}", - node.getID(), ipStr); + node.getId().getValue(), ipStr); continue; } @@ -556,14 +556,14 @@ public class NeutronL3Adapter { if (actionForNode == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programRouterInterfaceStage1 for node {} sourceSegId {} destSegId {} mac {} ip {} mask {}" + "action {} is already done", - node.getNodeIDString(), sourceSegmentationId, destinationSegmentationId, + node.getId().getValue(), sourceSegmentationId, destinationSegmentationId, ipStr, mask, actionForNode); return; } if (actionForNode == Action.ADD && isProgrammed == Boolean.TRUE) { logger.trace("programRouterInterfaceStage1 for node {} sourceSegId {} destSegId {} mac {} ip {} mask {}" + "action {} is already done", - node.getNodeIDString(), sourceSegmentationId, destinationSegmentationId, + node.getId().getValue(), sourceSegmentationId, destinationSegmentationId, ipStr, mask, actionForNode); return; } @@ -620,12 +620,12 @@ public class NeutronL3Adapter { if (actionForNode == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programStaticArpStage1 node {} providerId {} mac {} ip {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); return; } if (actionForNode == Action.ADD && isProgrammed == Boolean.TRUE) { logger.trace("programStaticArpStage1 node {} providerId {} mac {} ip {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); return; } @@ -680,13 +680,13 @@ public class NeutronL3Adapter { if (actionForRewriteExclusion == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programIpRewriteExclusionStage1 node {} providerId {} {} cidr {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, isInbound ? "inbound" : "outbound", cidr, + node.getId().getValue(), providerSegmentationId, isInbound ? "inbound" : "outbound", cidr, actionForRewriteExclusion); return; } if (actionForRewriteExclusion == Action.ADD && isProgrammed == Boolean.TRUE) { logger.trace("programIpRewriteExclusionStage1 node {} providerId {} {} cidr {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, isInbound ? "inbound" : "outbound", cidr, + node.getId().getValue(), providerSegmentationId, isInbound ? "inbound" : "outbound", cidr, actionForRewriteExclusion); return; } @@ -747,13 +747,13 @@ public class NeutronL3Adapter { if (actionForNodeDefaultRoute == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programDefaultRouteStage1 node {} providerId {} mac {} gw {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, defaultGatewayMacAddress, gatewayIp, + node.getId().getValue(), providerSegmentationId, defaultGatewayMacAddress, gatewayIp, actionForNodeDefaultRoute); return; } if (actionForNodeDefaultRoute == Action.ADD && isProgrammed == Boolean.TRUE) { logger.trace("programDefaultRouteStage1 node {} providerId {} mac {} gw {} action {} is already done", - node.getNodeIDString(), providerSegmentationId, defaultGatewayMacAddress, gatewayIp, + node.getId().getValue(), providerSegmentationId, defaultGatewayMacAddress, gatewayIp, actionForNodeDefaultRoute); return; } @@ -869,14 +869,14 @@ public class NeutronL3Adapter { if (actionForNode == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programIpRewriteStage1 node {} providerId {} {} matchAddr {} rewriteAddr {} action {}" + " is already done", - node.getNodeIDString(), providerSegmentationId, isInbound ? "inbound": "outbound", + node.getId().getValue(), providerSegmentationId, isInbound ? "inbound": "outbound", matchAddress, rewriteAddress, actionForNode); return; } if (actionForNode == Action.ADD && isProgrammed == Boolean.TRUE) { logger.trace("programIpRewriteStage1 node {} providerId {} {} matchAddr {} rewriteAddr {} action {}" + " is already done", - node.getNodeIDString(), providerSegmentationId, isInbound ? "inbound": "outbound", + node.getId().getValue(), providerSegmentationId, isInbound ? "inbound": "outbound", matchAddress, rewriteAddress, actionForNode); return; } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java index 25a08470f..4a3116d9a 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java @@ -12,11 +12,11 @@ package org.opendaylight.ovsdb.openstack.netvirt.impl; import java.util.HashMap; import java.util.Map; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 427c39fe7..00680427a 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 @@ -13,17 +13,17 @@ import org.opendaylight.neutron.spi.INeutronNetworkCRUD; import org.opendaylight.neutron.spi.INeutronPortCRUD; import org.opendaylight.neutron.spi.NeutronNetwork; import org.opendaylight.neutron.spi.NeutronPort; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.OvsdbSet; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import com.google.common.base.Preconditions; import org.slf4j.Logger; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImpl.java index 6bf8af8fa..767be4625 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImpl.java @@ -11,16 +11,16 @@ package org.opendaylight.ovsdb.openstack.netvirt.impl; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.openstack.netvirt.NodeConfiguration; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java index 59b41ec99..b1af2d1ad 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java @@ -18,7 +18,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.controller.sal.core.Node; +//import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.Column; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; @@ -26,10 +26,11 @@ import org.opendaylight.ovsdb.lib.schema.GenericTableSchema; import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -- 2.36.6