From 08c03979ac2fc1b725224e0aba84cca281ac4225 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Mon, 20 Apr 2015 22:52:54 -0400 Subject: [PATCH] Use Topology Node in place of Inventory Node Change-Id: I8aa774acc6d617036d5803716619573df52e0697 Signed-off-by: Sam Hague --- .../openflow13/AbstractServiceInstance.java | 10 ++- .../providers/openflow13/OF13Provider.java | 83 ++++++++----------- .../services/ArpResponderService.java | 4 +- .../openflow13/services/EgressAclService.java | 3 +- .../services/InboundNatService.java | 6 +- .../services/IngressAclService.java | 3 +- .../services/L3ForwardingService.java | 2 +- .../services/OutboundNatService.java | 5 +- .../openflow13/services/RoutingService.java | 6 +- .../openflow13/OF13ProviderTest.java | 26 +++--- .../services/ArpResponderServiceTest.java | 4 +- .../services/EgressAclServiceTest.java | 14 ++-- .../services/InboundNatServiceTest.java | 26 ++++-- .../services/IngressAclServiceTest.java | 14 ++-- .../services/L3FowardingServiceTest.java | 15 +++- .../services/OutboundNatServiceTest.java | 12 +-- .../services/RoutingServiceTest.java | 28 +++++-- .../netvirt/LBaaSPoolMemberHandler.java | 3 +- .../openstack/netvirt/NetworkHandler.java | 2 +- .../ovsdb/openstack/netvirt/PortHandler.java | 2 +- .../openstack/netvirt/SouthboundEvent.java | 3 +- .../openstack/netvirt/SouthboundHandler.java | 12 ++- .../openstack/netvirt/api/ArpProvider.java | 4 +- .../api/BridgeConfigurationManager.java | 24 +++--- .../netvirt/api/ConfigurationService.java | 2 +- .../openstack/netvirt/api/Connection.java | 18 +--- .../netvirt/api/EgressAclProvider.java | 3 +- .../netvirt/api/InboundNatProvider.java | 6 +- .../netvirt/api/IngressAclProvider.java | 3 +- .../netvirt/api/L3ForwardingProvider.java | 4 +- .../openstack/netvirt/api/MdsalConsumer.java | 2 +- .../netvirt/api/NetworkingProvider.java | 4 +- .../api/NetworkingProviderManager.java | 8 +- .../netvirt/api/OutboundNatProvider.java | 6 +- .../api/OvsdbConfigurationService.java | 2 +- .../netvirt/api/OvsdbConnectionService.java | 2 +- .../netvirt/api/OvsdbInventoryListener.java | 4 +- .../netvirt/api/RoutingProvider.java | 6 +- .../netvirt/api/TenantNetworkManager.java | 2 +- .../netvirt/api/VlanConfigurationCache.java | 2 +- .../impl/BridgeConfigurationManagerImpl.java | 2 +- .../impl/ConfigurationServiceImpl.java | 6 +- .../openstack/netvirt/impl/MdsalUtils.java | 18 +++- .../netvirt/impl/NeutronL3Adapter.java | 44 +++++----- .../netvirt/impl/OvsdbDataChangeListener.java | 2 +- .../impl/OvsdbInventoryServiceImpl.java | 2 +- .../openstack/netvirt/impl/OvsdbNode.java | 15 ++++ .../impl/ProviderNetworkManagerImpl.java | 3 +- .../impl/TenantNetworkManagerImpl.java | 2 +- .../impl/VlanConfigurationCacheImpl.java | 2 +- .../BridgeConfigurationManagerImplTest.java | 3 +- .../impl/ConfigurationServiceImplTest.java | 12 +-- .../netvirt/impl/NeutronL3AdapterTest.java | 6 +- .../impl/ProviderNetworkManagerImplTest.java | 2 +- .../impl/TenantNetworkManagerImplTest.java | 2 +- .../impl/VlanConfigurationCacheImplTest.java | 2 +- 56 files changed, 268 insertions(+), 240 deletions(-) create mode 100644 openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbNode.java 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 3c7a64cfa..6d089bbb3 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 @@ -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.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; 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; @@ -90,9 +91,9 @@ public abstract class AbstractServiceInstance { private String getBridgeName(String nodeId){ /* TODO SB_MIGRATION */ - List ovsNodes = connectionService.getNodes(); + List ovsNodes = connectionService.getNodes(); - for (Node ovsNode : ovsNodes) { + for (org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node ovsNode : ovsNodes) { Map bridges = ovsdbConfigService.getRows(ovsNode, ovsdbConfigService.getTableName(ovsNode, Bridge.class)); if (bridges == null) continue; for (String brUuid : bridges.keySet()) { @@ -105,7 +106,7 @@ public abstract class AbstractServiceInstance { if (dpid.equals(Long.parseLong(nodeId))){ // Found the bridge logger.debug("getOvsNode: found ovsNode {} bridge {} for ofNode {}", - ovsNode.getId().getValue(), bridge.getName(), nodeId); + ovsNode.getNodeId().getValue(), bridge.getName(), nodeId); return bridge.getName(); } } @@ -134,7 +135,8 @@ public abstract class AbstractServiceInstance { private static final InstanceIdentifier createFlowPath(FlowBuilder flowBuilder, NodeBuilder nodeBuilder) { return InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeBuilder.getKey()) + .child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class, + nodeBuilder.getKey()) .augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flowBuilder.getTableId())) .child(Flow.class, flowBuilder.getKey()).build(); 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 0b946a4e5..5534abf1a 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 @@ -26,19 +26,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityGroup; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler; -import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager; -import org.opendaylight.ovsdb.openstack.netvirt.api.ClassifierProvider; -import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService; -import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; -import org.opendaylight.ovsdb.openstack.netvirt.api.EgressAclProvider; -import org.opendaylight.ovsdb.openstack.netvirt.api.IngressAclProvider; -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.Status; -import org.opendaylight.ovsdb.openstack.netvirt.api.StatusCode; -import org.opendaylight.ovsdb.openstack.netvirt.api.StatusWithUuid; -import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; +import org.opendaylight.ovsdb.openstack.netvirt.api.*; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; @@ -83,7 +71,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.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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; @@ -110,6 +98,8 @@ public class OF13Provider implements NetworkingProvider { private volatile ConfigurationService configurationService; private volatile BridgeConfigurationManager bridgeConfigurationManager; private volatile TenantNetworkManager tenantNetworkManager; + private volatile OvsdbConfigurationService ovsdbConfigurationService; + private volatile OvsdbConnectionService connectionService; private volatile MdsalConsumer mdsalConsumer; private volatile SecurityServicesManager securityServicesManager; private volatile IngressAclProvider ingressAclProvider; @@ -162,7 +152,7 @@ public class OF13Provider implements NetworkingProvider { } private boolean isTunnelPresent(Node node, String tunnelName, String bridgeUUID) throws Exception { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); Row bridgeRow = ovsdbConfigurationService .getRow(node, ovsdbConfigurationService.getTableName(node, Bridge.class), bridgeUUID); @@ -175,12 +165,12 @@ public class OF13Provider implements NetworkingProvider { Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow); if (port != null && tunnelName.equalsIgnoreCase(port.getName())) return true; } - }*/ + } return false; } private String getPortUuid(Node node, String name, String bridgeUUID) throws Exception { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); Row bridgeRow = ovsdbConfigurationService .getRow(node, ovsdbConfigurationService.getTableName(node, Bridge.class), bridgeUUID); @@ -193,12 +183,12 @@ public class OF13Provider implements NetworkingProvider { Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow); if (port != null && name.equalsIgnoreCase(port.getName())) return portUUID.toString(); } - }*/ + } return null; } private Status addTunnelPort (Node node, String tunnelType, InetAddress src, InetAddress dst) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); try { String bridgeUUID = null; @@ -273,13 +263,12 @@ public class OF13Provider implements NetworkingProvider { } catch (Exception e) { logger.error("Exception in addTunnelPort", e); return new Status(StatusCode.INTERNALERROR); - }*/ - return new Status(StatusCode.INTERNALERROR); + } } /* delete port from ovsdb port table */ private Status deletePort(Node node, String bridgeName, String portName) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); try { String bridgeUUID = null; @@ -314,8 +303,7 @@ public class OF13Provider implements NetworkingProvider { } catch (Exception e) { logger.error("Exception in deletePort", e); return new Status(StatusCode.INTERNALERROR); - }*/ - return new Status(StatusCode.INTERNALERROR); + } } private Status deleteTunnelPort(Node node, String tunnelType, InetAddress src, InetAddress dst) { @@ -889,9 +877,9 @@ public class OF13Provider implements NetworkingProvider { NeutronSecurityGroup securityGroupInPort = securityServicesManager.getSecurityGroupInPort(intf); logger.debug("Program Local rules for networkType: {} does contain a Port Security Group: {} " + "to be installed on DPID: {}", networkType, securityGroupInPort, dpid); - ingressAclProvider.programPortSecurityACL(node, dpid, segmentationId, attachedMac, localPort, + ingressAclProvider.programPortSecurityACL(dpid, segmentationId, attachedMac, localPort, securityGroupInPort); - egressAclProvider.programPortSecurityACL(node, dpid, segmentationId, attachedMac, localPort, + egressAclProvider.programPortSecurityACL(dpid, segmentationId, attachedMac, localPort, securityGroupInPort); } if (networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE) || @@ -947,7 +935,7 @@ public class OF13Provider implements NetworkingProvider { private void programTunnelRules (String tunnelType, String segmentationId, InetAddress dst, Node node, Interface intf, boolean local) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); try { @@ -999,7 +987,7 @@ public class OF13Provider implements NetworkingProvider { programRemoteEgressTunnelBridgeRules(node, dpid, segmentationId, attachedMac, tunnelOFPort, localPort); } logger.trace("program local ingress tunnel rules: node" - + node.getId().getValue() + " intf " + intf.getName()); + + node.getNodeId().getValue() + " intf " + intf.getName()); if (local) { programLocalIngressTunnelBridgeRules(node, dpid, segmentationId, attachedMac, tunnelOFPort, localPort); } @@ -1010,12 +998,11 @@ public class OF13Provider implements NetworkingProvider { } catch (Exception e) { logger.error("", e); } - */ } private void removeTunnelRules (String tunnelType, String segmentationId, InetAddress dst, Node node, Interface intf, boolean local, boolean isLastInstanceOnNode) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); try { @@ -1074,11 +1061,11 @@ public class OF13Provider implements NetworkingProvider { } } catch (Exception e) { logger.error("", e); - }*/ + } } private void programVlanRules (NeutronNetwork network, Node node, Interface intf) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); logger.debug("Program vlan rules for interface {}", intf.getName()); try { @@ -1153,12 +1140,12 @@ public class OF13Provider implements NetworkingProvider { } } catch (Exception e) { logger.error("", e); - }*/ + } } private void removeVlanRules (NeutronNetwork network, Node node, Interface intf, boolean isLastInstanceOnNode) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); logger.debug("Remove vlan rules for interface {}", intf.getName()); @@ -1218,12 +1205,12 @@ public class OF13Provider implements NetworkingProvider { } } catch (Exception e) { logger.error("", e); - }*/ + } } @Override public Status handleInterfaceUpdate(NeutronNetwork network, Node srcNode, Interface intf) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(connectionService); List nodes = connectionService.getNodes(); nodes.remove(srcNode); @@ -1252,13 +1239,13 @@ public class OF13Provider implements NetworkingProvider { dst != null ? dst.getHostAddress() : "null"); } } - }*/ + } return new Status(StatusCode.SUCCESS); } private Status triggerInterfaceUpdates(Node node) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); try { Map intfs = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Interface.class)); @@ -1275,7 +1262,7 @@ public class OF13Provider implements NetworkingProvider { } catch (Exception e) { logger.error("Error Triggering the lost interface updates for "+ node, e); return new Status(StatusCode.INTERNALERROR, e.getLocalizedMessage()); - }*/ + } return new Status(StatusCode.SUCCESS); } @Override @@ -1287,7 +1274,7 @@ public class OF13Provider implements NetworkingProvider { @Override public Status handleInterfaceDelete(String tunnelType, NeutronNetwork network, Node srcNode, Interface intf, boolean isLastInstanceOnNode) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(connectionService); Status status = new Status(StatusCode.SUCCESS); List nodes = connectionService.getNodes(); @@ -1324,11 +1311,11 @@ public class OF13Provider implements NetworkingProvider { InetAddress dst = configurationService.getTunnelEndPoint(dstNode); if ((src != null) && (dst != null)) { logger.info("Remove tunnel rules for interface " - + intf.getName() + " on srcNode " + srcNode.getId().getValue()); + + intf.getName() + " on srcNode " + srcNode.getNodeId().getValue()); this.removeTunnelRules(tunnelType, network.getProviderSegmentationID(), dst, srcNode, intf, true, isLastInstanceOnNode); logger.info("Remove tunnel rules for interface " - + intf.getName() + " on dstNode " + dstNode.getId().getValue()); + + intf.getName() + " on dstNode " + dstNode.getNodeId().getValue()); this.removeTunnelRules(tunnelType, network.getProviderSegmentationID(), src, dstNode, intf, false, isLastInstanceOnNode); } else { @@ -1339,7 +1326,7 @@ public class OF13Provider implements NetworkingProvider { } } } - }*/ + } //return status; return new Status(StatusCode.SUCCESS); } @@ -2121,8 +2108,8 @@ public class OF13Provider implements NetworkingProvider { } @Override - public void initializeOFFlowRules(Node openflowNode) { - /* TODO SB_MIGRATION + public void initializeOFFlowRules(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node openflowNode) { + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(connectionService); List ovsNodes = connectionService.getNodes(); if (ovsNodes == null) return; @@ -2140,7 +2127,7 @@ public class OF13Provider implements NetworkingProvider { this.initializeFlowRules(ovsNode, configurationService.getIntegrationBridgeName()); this.triggerInterfaceUpdates(ovsNode); } - }*/ + } } @Override @@ -2162,7 +2149,7 @@ public class OF13Provider implements NetworkingProvider { } private String getInternalBridgeUUID (Node node, String bridgeName) { - /* TODO SB_MIGRATION + /* TODO SB_MIGRATION */ Preconditions.checkNotNull(ovsdbConfigurationService); try { Map bridgeTable = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Bridge.class)); @@ -2173,7 +2160,7 @@ public class OF13Provider implements NetworkingProvider { } } catch (Exception e) { logger.error("Error getting Bridge Identifier for {} / {}", node, bridgeName, e); - }*/ + } return null; } } 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 6ec1a7888..1494caf05 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 @@ -38,7 +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.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; @@ -54,7 +54,7 @@ public class ArpResponderService extends AbstractServiceInstance implements ArpP } @Override - public Status programStaticArpEntry(Node node, Long dpid, String segmentationId, String macAddressStr, + public Status programStaticArpEntry(Long dpid, String segmentationId, String macAddressStr, InetAddress ipAddress, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; 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 a7803d2f2..f4fa6495e 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 @@ -31,7 +31,6 @@ 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; @@ -51,7 +50,7 @@ public class EgressAclService extends AbstractServiceInstance implements EgressA } @Override - public void programPortSecurityACL(Node node, Long dpid, String segmentationId, String attachedMac, long localPort, + public void programPortSecurityACL(Long dpid, String segmentationId, String attachedMac, long localPort, NeutronSecurityGroup securityGroup) { logger.trace("programLocalBridgeRulesWithSec neutronSecurityGroup: {} ", securityGroup); 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 8169b55e7..0ef8c3a65 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 @@ -32,7 +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.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import com.google.common.collect.Lists; @@ -47,7 +47,7 @@ public class InboundNatService extends AbstractServiceInstance implements Inboun } @Override - public Status programIpRewriteRule(Node node, Long dpid, String segmentationId, InetAddress matchAddress, + public Status programIpRewriteRule(Long dpid, String segmentationId, InetAddress matchAddress, InetAddress rewriteAddress, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; @@ -100,7 +100,7 @@ public class InboundNatService extends AbstractServiceInstance implements Inboun } @Override - public Status programIpRewriteExclusion(Node node, Long dpid, String segmentationId, String excludedCidr, + public Status programIpRewriteExclusion(Long dpid, String segmentationId, String excludedCidr, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; 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 3ccdead9a..65409c775 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 @@ -31,7 +31,6 @@ 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; @@ -51,7 +50,7 @@ public class IngressAclService extends AbstractServiceInstance implements Ingres } @Override - public void programPortSecurityACL(Node node, Long dpid, String segmentationId, String attachedMac, + public void programPortSecurityACL(Long dpid, String segmentationId, String attachedMac, long localPort, NeutronSecurityGroup securityGroup) { logger.trace("programLocalBridgeRulesWithSec neutronSecurityGroup: {} ", securityGroup); 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 f063006fd..1b86a4e8a 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 @@ -49,7 +49,7 @@ public class L3ForwardingService extends AbstractServiceInstance implements L3Fo } @Override - public Status programForwardingTableEntry(Node node, Long dpid, String segmentationId, InetAddress ipAddress, + public Status programForwardingTableEntry(Long dpid, String segmentationId, InetAddress ipAddress, String macAddress, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; 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 afd56d846..7112d07b3 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 @@ -33,7 +33,6 @@ 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; @@ -48,7 +47,7 @@ public class OutboundNatService extends AbstractServiceInstance implements Outbo } @Override - public Status programIpRewriteRule(Node node, Long dpid, String segmentationId, InetAddress matchAddress, + public Status programIpRewriteRule(Long dpid, String segmentationId, InetAddress matchAddress, InetAddress rewriteAddress, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; @@ -103,7 +102,7 @@ public class OutboundNatService extends AbstractServiceInstance implements Outbo } @Override - public Status programIpRewriteExclusion(Node node, Long dpid, String segmentationId, String excludedCidr, + public Status programIpRewriteExclusion(Long dpid, String segmentationId, String excludedCidr, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; 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 445dcd012..c13ed287b 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 @@ -38,7 +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.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; import com.google.common.collect.Lists; @@ -53,7 +53,7 @@ public class RoutingService extends AbstractServiceInstance implements RoutingPr } @Override - public Status programRouterInterface(Node node, Long dpid, String sourceSegId, String destSegId, String macAddress, + public Status programRouterInterface(Long dpid, String sourceSegId, String destSegId, String macAddress, InetAddress address, int mask, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; @@ -130,7 +130,7 @@ public class RoutingService extends AbstractServiceInstance implements RoutingPr } @Override - public Status programDefaultRouteEntry(Node node, Long dpid, String segmentationId, String macAddress, + public Status programDefaultRouteEntry(Long dpid, String segmentationId, String macAddress, InetAddress nextHop, Action action) { String nodeName = Constants.OPENFLOW_NODE_PREFIX + dpid; diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13ProviderTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13ProviderTest.java index bbdbdf795..157f9fa5c 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13ProviderTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13ProviderTest.java @@ -64,10 +64,13 @@ import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; import org.opendaylight.ovsdb.utils.mdsal.node.StringConvertor; -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.NodeId; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; +//import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; import org.osgi.framework.ServiceReference; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -82,6 +85,7 @@ public class OF13ProviderTest { @InjectMocks private OF13Provider of13Provider; @Mock private NeutronNetwork network; + @Mock private org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node openflowNode; @Mock private Node node; @Mock private Node node2; @Mock private Node node3; @@ -128,21 +132,21 @@ public class OF13ProviderTest { NodeKey nodeKey = new NodeKey(nodeId); node = Mockito.mock(Node.class); - when(node.getId()).thenReturn(nodeId); + when(node.getNodeId()).thenReturn(nodeId); when(node.getKey()).thenReturn(new NodeKey(nodeId)); when(configurationService.getTunnelEndPoint(node)).thenReturn(InetAddress.getByName("192.168.0.1")); nodeList.add(node); nodeId = new NodeId("Node2"); node2 = Mockito.mock(Node.class); - when(node2.getId()).thenReturn(nodeId); + when(node2.getNodeId()).thenReturn(nodeId); when(node2.getKey()).thenReturn(new NodeKey(nodeId)); when(configurationService.getTunnelEndPoint(node2)).thenReturn(InetAddress.getByName("192.168.0.2")); nodeList.add(node2); nodeId = new NodeId("Node3"); node3 = Mockito.mock(Node.class); - when(node3.getId()).thenReturn(nodeId); + when(node3.getNodeId()).thenReturn(nodeId); when(node3.getKey()).thenReturn(new NodeKey(nodeId)); when(configurationService.getTunnelEndPoint(node3)).thenReturn(InetAddress.getByName("192.168.0.3")); nodeList.add(node3); @@ -267,13 +271,13 @@ public class OF13ProviderTest { @Test public void initializeOFFlowRulesTest(){ - of13Provider.initializeOFFlowRules(node); + of13Provider.initializeOFFlowRules(openflowNode); //verify(connectionService, times(1)).getNodes(); } /** * Test method - * {@link OF13Provider#handleInterfaceUpdateTest(NeutronNetwor, Node, Interface)} + * {@link OF13Provider#handleInterfaceUpdateTest(NeutronNetwork, Node, Interface)} */ @Test public void handleInterfaceUpdateTest(){ @@ -310,7 +314,7 @@ public class OF13ProviderTest { /** * Test method - * {@link OF13Provider#handleInterfaceDelete(String, NeutronNetwor, Node, Interface, boolean)} + * {@link OF13Provider#handleInterfaceDelete(String, NeutronNetwork, Node, Interface, boolean)} */ @Test public void handleInterfaceDeleteTest(){ @@ -346,8 +350,8 @@ public class OF13ProviderTest { final String nodeId="node1"; NodeBuilder builder = new NodeBuilder(); - builder.setId(new NodeId(nodeId)); - builder.setKey(new NodeKey(builder.getId())); + builder.setId(new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId(nodeId)); + builder.setKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey(builder.getId())); NodeBuilder builderStatic = OF13Provider.createNodeBuilder(nodeId); diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderServiceTest.java index fee3fdc78..822e366ae 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderServiceTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderServiceTest.java @@ -71,14 +71,14 @@ public class ArpResponderServiceTest { when(mdsalConsumer.getDataBroker()).thenReturn(dataBroker); // test for Action.ADD - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), arpResponderService.programStaticArpEntry(mock(Node.class), Long.valueOf(12), "2", MAC_ADDRESS, ipAddress, Action.ADD)); + assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), arpResponderService.programStaticArpEntry(Long.valueOf(12), "2", MAC_ADDRESS, ipAddress, Action.ADD)); verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); // test other Action, here Action.DELETE - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), arpResponderService.programStaticArpEntry(mock(Node.class), Long.valueOf(12), "2", MAC_ADDRESS, ipAddress, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), arpResponderService.programStaticArpEntry(Long.valueOf(12), "2", MAC_ADDRESS, ipAddress, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(commitFuture, times(2)).get(); // 1 + 1 above diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java index c68add068..d2c58fe0e 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java @@ -100,7 +100,7 @@ public class EgressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - egressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); + egressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); verify(egressAclServiceSpy, times(1)).egressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(egressAclServiceSpy, times(1)).egressACLTcpPortWithPrefix(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -118,7 +118,7 @@ public class EgressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - egressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); + egressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); verify(egressAclServiceSpy, times(1)).egressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(egressAclServiceSpy, times(1)).egressACLTcpPortWithPrefix(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -136,7 +136,7 @@ public class EgressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(null); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - egressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); + egressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); verify(egressAclServiceSpy, times(1)).egressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(egressAclServiceSpy, times(1)).egressACLPermitAllProto(anyLong(), anyString(), anyString(), anyBoolean(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -154,7 +154,7 @@ public class EgressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(null); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - egressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); + egressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); verify(egressAclServiceSpy, times(1)).egressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(egressAclServiceSpy, times(1)).egressACLPermitAllProto(anyLong(), anyString(), anyString(), anyBoolean(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -172,7 +172,7 @@ public class EgressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(null); - egressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); + egressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); verify(egressAclServiceSpy, times(1)).egressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(egressAclServiceSpy, times(1)).egressACLTcpSyn(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -190,7 +190,7 @@ public class EgressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(null); - egressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); + egressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); verify(egressAclServiceSpy, times(1)).egressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(egressAclServiceSpy, times(1)).egressACLTcpSyn(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -208,7 +208,7 @@ public class EgressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(null); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(null); - egressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); + egressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), "2", MAC_ADDRESS, 124, securityGroup); verify(egressAclServiceSpy, times(1)).egressAllowProto(anyLong(), anyString(), anyString(), anyBoolean(), anyString(), anyInt()); verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatServiceTest.java index 9f2576a96..b9fa30ad8 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatServiceTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/InboundNatServiceTest.java @@ -73,7 +73,7 @@ public class InboundNatServiceTest { } /** - * Test method {@link InboundNatService#programIpRewriteRule(Node, Long, String, InetAddress, InetAddress, Action)} + * Test method {@link InboundNatService#programIpRewriteRule(Long, String, InetAddress, InetAddress, Action)} */ @Test public void testProgramIpRewriteRule() throws Exception { @@ -82,28 +82,40 @@ public class InboundNatServiceTest { InetAddress matchAddress = mock(InetAddress.class); when(matchAddress.getHostAddress()).thenReturn(HOST_ADDRESS); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), inboundNatService.programIpRewriteRule(mock(Node.class), Long.valueOf(123), "2", matchAddress, rewriteAddress, Action.ADD)); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + inboundNatService.programIpRewriteRule(Long.valueOf(123), "2", + matchAddress, rewriteAddress, Action.ADD)); verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), inboundNatService.programIpRewriteRule(mock(Node.class), Long.valueOf(123), "2", matchAddress, rewriteAddress, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + inboundNatService.programIpRewriteRule(Long.valueOf(123), "2", + matchAddress, rewriteAddress, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(2)).get(); // 1 + 1 above } /** - * Test method {@link InboundNatService#programIpRewriteExclusion(Node, Long, String, String, Action)} + * Test method {@link InboundNatService#programIpRewriteExclusion(Long, String, String, Action)} */ @Test public void testProgramIpRewriteExclusion() throws Exception { - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), inboundNatService.programIpRewriteExclusion(mock(Node.class), Long.valueOf(123), "2", HOST_ADDRESS_PREFIX, Action.ADD)); - verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + inboundNatService.programIpRewriteExclusion(Long.valueOf(123), "2", HOST_ADDRESS_PREFIX, Action.ADD)); + verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), + any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), inboundNatService.programIpRewriteExclusion(mock(Node.class), Long.valueOf(123), "2", HOST_ADDRESS_PREFIX, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + inboundNatService.programIpRewriteExclusion(Long.valueOf(123), "2", + HOST_ADDRESS_PREFIX, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(2)).get(); // 1 + 1 above diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclServiceTest.java index 7086b64a1..2556cf28d 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclServiceTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclServiceTest.java @@ -103,7 +103,7 @@ public class IngressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - ingressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); + ingressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); verify(ingressAclServiceSpy, times(1)).ingressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(ingressAclServiceSpy, times(1)).ingressACLTcpPortWithPrefix(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -122,7 +122,7 @@ public class IngressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - ingressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); + ingressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); verify(ingressAclServiceSpy, times(1)).ingressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(ingressAclServiceSpy, times(1)).ingressACLTcpPortWithPrefix(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -140,7 +140,7 @@ public class IngressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(null); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - ingressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); + ingressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); verify(ingressAclServiceSpy, times(1)).ingressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(ingressAclServiceSpy, times(1)).ingressACLPermitAllProto(anyLong(), anyString(), anyString(), anyBoolean(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -158,7 +158,7 @@ public class IngressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(null); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(HOST_ADDRESS); - ingressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); + ingressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); verify(ingressAclServiceSpy, times(1)).ingressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(ingressAclServiceSpy, times(1)).ingressACLPermitAllProto(anyLong(), anyString(), anyString(), anyBoolean(), anyString(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -176,7 +176,7 @@ public class IngressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(null); - ingressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); + ingressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); verify(ingressAclServiceSpy, times(1)).ingressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(ingressAclServiceSpy, times(1)).ingressACLTcpSyn(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -194,7 +194,7 @@ public class IngressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(1); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(null); - ingressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); + ingressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); verify(ingressAclServiceSpy, times(1)).ingressACLDefaultTcpDrop(anyLong(), anyString(), anyString(), anyInt(), anyBoolean()); verify(ingressAclServiceSpy, times(1)).ingressACLTcpSyn(anyLong(), anyString(), anyString(), anyBoolean(), anyInt(), anyInt()); verify(readWriteTransaction, times(4)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); @@ -212,7 +212,7 @@ public class IngressAclServiceTest { when(portSecurityRule.getSecurityRulePortMin()).thenReturn(null); when(portSecurityRule.getSecurityRuleRemoteIpPrefix()).thenReturn(null); - ingressAclServiceSpy.programPortSecurityACL(mock(Node.class), Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); + ingressAclServiceSpy.programPortSecurityACL(Long.valueOf(1554), SEGMENTATION_ID, MAC_ADDRESS, 124, securityGroup); verify(ingressAclServiceSpy, times(1)).handleIngressAllowProto(anyLong(), anyString(), anyString(), anyBoolean(), anyString(), anyInt()); verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3FowardingServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3FowardingServiceTest.java index dea7bf581..7fe8956ee 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3FowardingServiceTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3FowardingServiceTest.java @@ -74,19 +74,26 @@ public class L3FowardingServiceTest { } /** - * Test method {@link L3ForwardingService#programForwardingTableEntry(Node, Long, String, InetAddress, String, Action)} + * Test method {@link L3ForwardingService#programForwardingTableEntry(Long, String, InetAddress, String, Action)} */ @Test public void testProgramForwardingTableEntry() throws Exception { InetAddress address = mock(InetAddress.class); when(address.getHostAddress()).thenReturn(HOST_ADDRESS); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), l3ForwardingService.programForwardingTableEntry(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, address, MAC_ADDRESS, Action.ADD)); - verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + l3ForwardingService.programForwardingTableEntry(Long.valueOf(123), + SEGMENTATION_ID, address, MAC_ADDRESS, Action.ADD)); + verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), + any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), l3ForwardingService.programForwardingTableEntry(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, address, MAC_ADDRESS, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + l3ForwardingService.programForwardingTableEntry(Long.valueOf(123), + SEGMENTATION_ID, address, MAC_ADDRESS, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(2)).get(); // 1 + 1 above diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatServiceTest.java index ce3984eb2..7e19d7dee 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatServiceTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/OutboundNatServiceTest.java @@ -74,35 +74,35 @@ public class OutboundNatServiceTest { } /** - * Test method {@link OutboundNatService#programIpRewriteRule(Node, Long, String, InetAddress, InetAddress, Action)} + * Test method {@link OutboundNatService#programIpRewriteRule(Long, String, InetAddress, InetAddress, Action)} */ @Test public void testProgramIpRewriteRule() throws Exception { InetAddress address = mock(InetAddress.class); when(address.getHostAddress()).thenReturn(HOST_ADDRESS); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteRule(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, address, address, Action.ADD)); + assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteRule(Long.valueOf(123), SEGMENTATION_ID, address, address, Action.ADD)); verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteRule(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, address, address, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteRule(Long.valueOf(123), SEGMENTATION_ID, address, address, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(2)).get(); // 1 + 1 above } /** - * Test method {@link OutboundNatService#programIpRewriteExclusion(Node, Long, String, String, Action)} + * Test method {@link OutboundNatService#programIpRewriteExclusion(Long, String, String, Action)} */ @Test public void testProgramIpRewriteExclusion() throws Exception { - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteExclusion(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, HOST_ADDRESS_PREFIX, Action.ADD)); + assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteExclusion(Long.valueOf(123), SEGMENTATION_ID, HOST_ADDRESS_PREFIX, Action.ADD)); verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteExclusion(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, HOST_ADDRESS_PREFIX, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), outboundNatService.programIpRewriteExclusion(Long.valueOf(123), SEGMENTATION_ID, HOST_ADDRESS_PREFIX, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(2)).get(); // 1 + 1 above diff --git a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingServiceTest.java b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingServiceTest.java index be8c07677..b09340405 100644 --- a/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingServiceTest.java +++ b/openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingServiceTest.java @@ -74,41 +74,53 @@ public class RoutingServiceTest { } /** - * Test method {@link RoutingService#programRouterInterface(Node, Long, String, String, String, InetAddress, int, Action)} + * Test method {@link RoutingService#programRouterInterface(Long, String, String, String, InetAddress, int, Action)} */ @Test public void testProgramRouterInterface() throws Exception { InetAddress address = mock(InetAddress.class); when(address.getHostAddress()).thenReturn(HOST_ADDRESS); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), routingService.programRouterInterface(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, SEGMENTATION_ID, MAC_ADDRESS, address, 1, Action.ADD)); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + routingService.programRouterInterface(Long.valueOf(123), + SEGMENTATION_ID, SEGMENTATION_ID, MAC_ADDRESS, address, 1, Action.ADD)); verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), routingService.programRouterInterface(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, SEGMENTATION_ID, MAC_ADDRESS, address, 1, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + routingService.programRouterInterface(Long.valueOf(123), + SEGMENTATION_ID, SEGMENTATION_ID, MAC_ADDRESS, address, 1, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(2)).get(); // 1 + 1 above } /** - * Test method {@link RoutingService#programDefaultRouteEntry(Node, Long, String, String, InetAddress, Action)} + * Test method {@link RoutingService#programDefaultRouteEntry(Long, String, String, InetAddress, Action)} */ @Test public void testProgramDefaultRouteEntry() throws Exception { InetAddress address = mock(InetAddress.class); when(address.getHostAddress()).thenReturn(HOST_ADDRESS); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), routingService.programDefaultRouteEntry(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, MAC_ADDRESS, address, Action.ADD)); - verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(Node.class), anyBoolean()); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + routingService.programDefaultRouteEntry(Long.valueOf(123), + SEGMENTATION_ID, MAC_ADDRESS, address, Action.ADD)); + verify(readWriteTransaction, times(2)).put(any(LogicalDatastoreType.class), + any(InstanceIdentifier.class), any(Node.class), anyBoolean()); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(1)).get(); - assertEquals("Error, did not return the expected StatusCode", new Status(StatusCode.SUCCESS), routingService.programDefaultRouteEntry(mock(Node.class), Long.valueOf(123), SEGMENTATION_ID, MAC_ADDRESS, address, Action.DELETE)); + assertEquals("Error, did not return the expected StatusCode", + new Status(StatusCode.SUCCESS), + routingService.programDefaultRouteEntry(Long.valueOf(123), + SEGMENTATION_ID, MAC_ADDRESS, address, Action.DELETE)); verify(writeTransaction, times(1)).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); verify(readWriteTransaction, times(1)).submit(); verify(commitFuture, times(2)).get(); // 1 + 1 above } - } 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 025dafac5..fd3b68859 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 @@ -78,7 +78,8 @@ public class LBaaSPoolMemberHandler extends AbstractHandler private void doNeutronLoadBalancerPoolMemberCreate(NeutronLoadBalancerPoolMember neutronLBPoolMember) { Preconditions.checkNotNull(loadBalancerProvider); LoadBalancerConfiguration lbConfig = extractLBConfiguration(neutronLBPoolMember); - final List nodes = nodeCacheManager.getNodes(); + final List nodes = + nodeCacheManager.getNodes(); if (lbConfig == null) { logger.debug("Neutron LB configuration invalid for member {} ", neutronLBPoolMember.getPoolMemberAddress()); } else if (lbConfig.getVip() == null) { 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 bd2b75084..49a4af970 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 @@ -23,7 +23,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; 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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 e955e1cbb..5bb45cb0b 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 @@ -21,7 +21,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; 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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 3699e2343..de9e85f78 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 @@ -11,7 +11,8 @@ package org.opendaylight.ovsdb.openstack.netvirt; 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; +//import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 e47cd5d7d..78c237976 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 @@ -22,7 +22,7 @@ import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch; import org.opendaylight.ovsdb.schema.openvswitch.Port; import org.opendaylight.ovsdb.utils.mdsal.node.StringConvertor; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -361,17 +361,21 @@ public class SouthboundHandler extends AbstractHandler /** * Notification about an OpenFlow Node * - * @param openFlowNode the {@link org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node Node} of interest in the notification + * @param openFlowNode the {@link Node Node} of interest in the notification * @param action the {@link Action} * @see NodeCacheListener#notifyNode */ @Override - public void notifyNode (Node openFlowNode, Action action) { + public void notifyNode (org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node openFlowNode, + Action action) { logger.info("notifyNode: Node {} update {} from Controller's inventory Service", openFlowNode, action); if (action.equals(Action.ADD)) { - networkingProviderManager.getProvider(openFlowNode).initializeOFFlowRules(openFlowNode); + /* TODO SB_MIGRATION + * Need to map from ovsdbNode to openflowNode + */ + //networkingProviderManager.getProvider(ovsdbNode).initializeOFFlowRules(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 20aa1117e..b1c1c0169 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,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; - import java.net.InetAddress; /** @@ -19,7 +17,7 @@ import java.net.InetAddress; */ public interface ArpProvider { - Status programStaticArpEntry(Node node, Long dpid, String segmentationId, + Status programStaticArpEntry(Long dpid, String segmentationId, String macAddress, InetAddress ipAddress, Action action); } 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 73f8d6a34..9edaf7d43 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 @@ -12,7 +12,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronNetwork; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; * OpenStack Neutron with the Open vSwitch plugin relies on a typical bridge configuration that * consists of br-int (Integration Bridge), br-net (Network bridge), br-ex (External bridge). * - * This class ensures that the bridges on each {@link org.opendaylight.controller.sal.core.Node} + * This class ensures that the bridges on each {@link Node} * are correctly configured for OpenStack Neutron * */ @@ -28,7 +28,7 @@ public interface BridgeConfigurationManager { /** * A helper function to get the UUID of a given Bridge - * @param node the {@link org.opendaylight.controller.sal.core.Node} where the bridge is configured + * @param node the {@link Node} where the bridge is configured * @param bridgeName the name of the bridge * @return the UUID of the bridge */ @@ -36,21 +36,21 @@ public interface BridgeConfigurationManager { /** * Checks for the existence of the Integration Bridge on a given Node - * @param node the {@link org.opendaylight.controller.sal.core.Node} where the bridge should be configured + * @param node the {@link Node} where the bridge should be configured * @return True if the bridge exists, False if it does not */ public boolean isNodeNeutronReady(Node node); /** * Checks for the existence of the Network Bridge on a given Node - * @param node the {@link org.opendaylight.controller.sal.core.Node} where the bridge should be configured + * @param node the {@link Node} where the bridge should be configured * @return True if the bridge exists, False if it does not */ public boolean isNodeOverlayReady(Node node); /** * Checks for the existence of the Network Bridge on a given Node - * @param node the {@link org.opendaylight.controller.sal.core.Node} where the bridge should be configured + * @param node the {@link Node} where the bridge should be configured * @return True if the bridge exists, False if it does not */ @@ -58,7 +58,7 @@ public interface BridgeConfigurationManager { * Checks that a Node is ready for a Tunnel Network Provider * For OpenFlow 1.0 the Integration, Network Bridge and corresponding patch ports are required * For OpenFlow 1.3 only the Integration Bridge is required - * @param node the {@link org.opendaylight.controller.sal.core.Node} where the bridge is configured + * @param node the {@link Node} where the bridge is configured * @return True or False */ public boolean isNodeTunnelReady(Node node); @@ -74,7 +74,7 @@ public interface BridgeConfigurationManager { * For OpenFlow 1.0 the Integration Bridge, Network Bridge, patch ports and a physical device connected to the * Network Bridge are required. * For OpenFlow 1.3 the Integration Bridge is required and must have a physical device connected. - * @param node the {@link org.opendaylight.controller.sal.core.Node} where the bridge is configured + * @param node the {@link Node} where the bridge is configured * @param network the {@link org.opendaylight.neutron.spi.NeutronNetwork} * @return True or False */ @@ -82,7 +82,7 @@ public interface BridgeConfigurationManager { /** * A helper function to determine if a port exists on a given bridge - * @param node the {@link org.opendaylight.controller.sal.core.Node} where the bridge is configured + * @param node the {@link Node} where the bridge is configured * @param bridge the {@link org.opendaylight.ovsdb.schema.openvswitch.Bridge} to query * @param portName the name of the port to search for * @return True if the port exists, otherwise False @@ -93,7 +93,7 @@ public interface BridgeConfigurationManager { /** * Returns true if the bridges required for the provider network type are created * If the bridges are not created, this method will attempt to create them - * @param node the {@link org.opendaylight.controller.sal.core.Node} to query + * @param node the {@link Node} to query * @param network the {@link org.opendaylight.neutron.spi.NeutronNetwork} * @return True or False */ @@ -101,7 +101,7 @@ public interface BridgeConfigurationManager { /** * Prepares the given Node for Neutron Networking by creating the Integration Bridge - * @param node the {@link org.opendaylight.controller.sal.core.Node} to prepare + * @param node the {@link Node} to prepare */ public void prepareNode(Node node); @@ -115,7 +115,7 @@ public interface BridgeConfigurationManager { /** Returns all physical interfaces configured in the bridge mapping * Bridge mappings will be of the following format: - * @param node the {@link org.opendaylight.controller.sal.core.Node} to query + * @param node the {@link Node} to query * @return a List in the format {eth1, eth2} given bridge_mappings=physnet1:eth1,physnet2:eth2 */ public List getAllPhysicalInterfaceNames(Node node); 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 8dd66e370..ef538fdb8 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.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.apache.commons.lang3.tuple.Pair; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Connection.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Connection.java index 329ed2a37..bc00c8ca8 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Connection.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Connection.java @@ -10,10 +10,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.ovsdb.lib.OvsdbClient; -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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,18 +31,7 @@ public class Connection { private static final Logger logger = LoggerFactory.getLogger(Connection.class); - public Connection(String identifier, OvsdbClient client) { - super(); - - this.identifier = identifier; - this.client = client; - this.idCounter = 0L; - NodeId nodeId = new NodeId("OVS" + "|" + identifier); - NodeKey nodeKey = new NodeKey(nodeId); - node = new NodeBuilder() - .setId(nodeId) - .setKey(nodeKey) - .build(); + public Connection(String identifier) { } public String getIdentifier() { 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 bfd1c978d..c9266e601 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,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronSecurityGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * This interface allows egress Port Security flows to be written to devices @@ -18,6 +17,6 @@ public interface EgressAclProvider { * @param localPort the local port * @param securityGroup the security group */ - public void programPortSecurityACL(Node node, Long dpid, String segmentationId, String attachedMac, + public void programPortSecurityACL(Long dpid, String segmentationId, String attachedMac, long localPort, NeutronSecurityGroup securityGroup); } 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 ba8daac09..aa2f91a62 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,18 +10,16 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; - import java.net.InetAddress; /** * This interface allows NAT flows to be written to devices */ public interface InboundNatProvider { - Status programIpRewriteRule(Node node, Long dpid, String segmentationId, InetAddress matchAddress, + Status programIpRewriteRule(Long dpid, String segmentationId, InetAddress matchAddress, InetAddress rewriteAddress, Action action); - Status programIpRewriteExclusion(Node node, Long dpid, String segmentationId, + Status programIpRewriteExclusion(Long dpid, String segmentationId, String excludedCidr, Action action); } 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 f4a4f3e66..97deed200 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,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronSecurityGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; /** * This interface allows ingress Port Security flows to be written to devices @@ -27,6 +26,6 @@ public interface IngressAclProvider { * @param localPort the local port * @param securityGroup the security group */ - public void programPortSecurityACL(Node node, Long dpid, String segmentationId, String attachedMac, + public void programPortSecurityACL(Long dpid, String segmentationId, String attachedMac, long localPort, NeutronSecurityGroup securityGroup); } 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 037754491..6adc46b04 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,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; - import java.net.InetAddress; /** @@ -19,7 +17,7 @@ import java.net.InetAddress; */ public interface L3ForwardingProvider { - Status programForwardingTableEntry(Node node, Long dpid, String segmentationId, InetAddress ipAddress, + Status programForwardingTableEntry(Long dpid, String segmentationId, InetAddress ipAddress, String macAddress, Action action); } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/MdsalConsumer.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/MdsalConsumer.java index bd6fa5311..ea4e17f9f 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/MdsalConsumer.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/MdsalConsumer.java @@ -9,7 +9,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import java.net.InetAddress; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; //import org.opendaylight.controller.sal.binding.api.NotificationProviderService; /** 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 3ff631e83..78311a0e7 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 @@ -12,7 +12,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronNetwork; import org.opendaylight.ovsdb.schema.openvswitch.Interface; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; /** * The NetworkingProvider interface is implemented by Neutron Networking Providers @@ -60,7 +60,7 @@ public interface NetworkingProvider { /** * Initialize the Flow rules for a given OpenFlow node */ - public void initializeOFFlowRules(Node openflowNode); + public void initializeOFFlowRules(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node openflowNode); /** * Generate event to announce flow capable node. 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 19be7ab2e..2ad5c4672 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,18 +10,18 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; /** - * The NetworkingProviderManager handles the mapping between {@link org.opendaylight.controller.sal.core.Node} + * The NetworkingProviderManager handles the mapping between {@Node} * and registered {@link org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider} implementations */ public interface NetworkingProviderManager { /** * Returns the Networking Provider for a given node - * @param node a {@link org.opendaylight.controller.sal.core.Node} + * @param ovsdbNode a {@link Node} * @return a NetworkProvider * @see NetworkingProvider */ - NetworkingProvider getProvider(Node node); + NetworkingProvider getProvider(Node ovsdbNode); } 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 53337c41b..3f8a73244 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,18 +10,16 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; - import java.net.InetAddress; /** * This interface allows NAT flows to be written to devices */ public interface OutboundNatProvider { - Status programIpRewriteRule(Node node, Long dpid, String segmentationId, InetAddress matchAddress, + Status programIpRewriteRule(Long dpid, String segmentationId, InetAddress matchAddress, InetAddress rewriteAddress, Action action); - Status programIpRewriteExclusion(Node node, Long dpid, String segmentationId, + Status programIpRewriteExclusion(Long dpid, String segmentationId, String excludedCidr, Action action); } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConfigurationService.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConfigurationService.java index 4b5aab715..adfc8fca7 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConfigurationService.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConfigurationService.java @@ -7,7 +7,7 @@ import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.lib.schema.GenericTableSchema; import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; /** * Created by shague on 4/20/15. diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConnectionService.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConnectionService.java index 55c3f3b53..4b92fb0a2 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConnectionService.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConnectionService.java @@ -2,7 +2,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import java.util.List; import java.util.Map; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; /** * Created by shague on 4/20/15. diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbInventoryListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbInventoryListener.java index dd0872057..56a1d4276 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbInventoryListener.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbInventoryListener.java @@ -1,9 +1,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import java.net.InetAddress; import org.opendaylight.ovsdb.lib.notation.Row; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -//import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; public interface OvsdbInventoryListener { public void ovsdbNodeAdded(Node node); 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 b9cb8d3e7..8b77f1f5f 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,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; - import java.net.InetAddress; /** @@ -19,10 +17,10 @@ import java.net.InetAddress; */ public interface RoutingProvider { - Status programRouterInterface(Node node, Long dpid, String srcSegId, String dstSegId, String macAddress, + Status programRouterInterface(Long dpid, String srcSegId, String dstSegId, String macAddress, InetAddress address, int mask, Action action); - Status programDefaultRouteEntry(Node node, Long dpid, String segmentationId, String macAddress, + Status programDefaultRouteEntry(Long dpid, String segmentationId, String macAddress, InetAddress nextHop, Action action); } 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 5eaf9cc33..d0c1ac7d4 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 @@ -12,7 +12,7 @@ package org.opendaylight.ovsdb.openstack.netvirt.api; import org.opendaylight.neutron.spi.NeutronNetwork; import org.opendaylight.ovsdb.schema.openvswitch.Interface; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 83497bf4d..5d57ee8e5 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.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 6519bec50..cb3847a73 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 @@ -27,7 +27,7 @@ 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 org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 8ed85801e..d1576f00d 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 @@ -21,8 +21,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.MdsalConsumer; import org.opendaylight.ovsdb.openstack.netvirt.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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -182,9 +181,10 @@ public class ConfigurationServiceImpl implements ConfigurationService { @Override public String getDefaultGatewayMacAddress(Node node) { + /* TODO SB_MIGRATION */ final String l3gatewayForNode = node != null ? - ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac." + node.getId().getValue()) : null; + ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac." + node.getNodeId().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/MdsalUtils.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/MdsalUtils.java index 287edbc10..5b8f5f2b8 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/MdsalUtils.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/MdsalUtils.java @@ -13,6 +13,9 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.ovsdb.southbound.SouthboundMapper; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,10 +34,21 @@ public class MdsalUtils { * * @param dataBroker the {@link org.opendaylight.controller.md.sal.binding.api.DataBroker} */ - public MdsalUtils (DataBroker dataBroker) { + public MdsalUtils(DataBroker dataBroker) { this.databroker = dataBroker; } - +/* + public static Node createNode(String nodeId) { + String[] pair = identifier.split("\\|"); + if ((pair.length > 1) && (pair[0].equals("OVS"))) { + id = pair[1]; + } + return id; + } + ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr); + SouthboundMapper.createNode(connectionInfo); + } +*/ /** * Executes read transaction as a test2. * 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 5247d7375..df54c0a41 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 @@ -27,7 +27,7 @@ import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.utils.config.ConfigProperties; import org.opendaylight.ovsdb.utils.mdsal.node.StringConvertor; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import com.google.common.base.Preconditions; import org.slf4j.Logger; @@ -303,12 +303,12 @@ public class NeutronL3Adapter { if (actionForNode == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programL3ForwardingStage1 for node {} providerId {} mac {} ip {} action {} is already done", - node.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getNodeId().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.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getNodeId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); return; } @@ -333,7 +333,7 @@ public class NeutronL3Adapter { InetAddress inetAddress = InetAddress.getByName(address); status = l3ForwardingProvider == null ? new Status(StatusCode.SUCCESS) : - l3ForwardingProvider.programForwardingTableEntry(node, dpid, providerSegmentationId, + l3ForwardingProvider.programForwardingTableEntry(dpid, providerSegmentationId, inetAddress, macAddress, actionForNode); } catch (UnknownHostException e) { status = new Status(StatusCode.BADREQUEST); @@ -406,7 +406,7 @@ public class NeutronL3Adapter { final String ipStr = neutronIP.getIpAddress(); if (ipStr.isEmpty()) { logger.debug("programFlowsForNeutronRouterInterface is skipping node {} ip {}", - node.getId().getValue(), ipStr); + node.getNodeId().getValue(), ipStr); continue; } @@ -548,14 +548,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.getId().getValue(), sourceSegmentationId, destinationSegmentationId, + node.getNodeId().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.getId().getValue(), sourceSegmentationId, destinationSegmentationId, + node.getNodeId().getValue(), sourceSegmentationId, destinationSegmentationId, ipStr, mask, actionForNode); return; } @@ -584,7 +584,7 @@ public class NeutronL3Adapter { InetAddress inetAddress = InetAddress.getByName(address); status = routingProvider == null ? new Status(StatusCode.SUCCESS) : - routingProvider.programRouterInterface(node, dpid, sourceSegmentationId, destinationSegmentationId, + routingProvider.programRouterInterface(dpid, sourceSegmentationId, destinationSegmentationId, macAddress, inetAddress, mask, actionForNode); } catch (UnknownHostException e) { status = new Status(StatusCode.BADREQUEST); @@ -612,12 +612,12 @@ public class NeutronL3Adapter { if (actionForNode == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programStaticArpStage1 node {} providerId {} mac {} ip {} action {} is already done", - node.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getNodeId().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.getId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); + node.getNodeId().getValue(), providerSegmentationId, macAddress, ipStr, actionForNode); return; } @@ -642,7 +642,7 @@ public class NeutronL3Adapter { InetAddress inetAddress = InetAddress.getByName(address); status = arpProvider == null ? new Status(StatusCode.SUCCESS) : - arpProvider.programStaticArpEntry(node, dpid, providerSegmentationId, + arpProvider.programStaticArpEntry(dpid, providerSegmentationId, macAddress, inetAddress, actionForNode); } catch (UnknownHostException e) { status = new Status(StatusCode.BADREQUEST); @@ -672,13 +672,13 @@ public class NeutronL3Adapter { if (actionForRewriteExclusion == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programIpRewriteExclusionStage1 node {} providerId {} {} cidr {} action {} is already done", - node.getId().getValue(), providerSegmentationId, isInbound ? "inbound" : "outbound", cidr, + node.getNodeId().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.getId().getValue(), providerSegmentationId, isInbound ? "inbound" : "outbound", cidr, + node.getNodeId().getValue(), providerSegmentationId, isInbound ? "inbound" : "outbound", cidr, actionForRewriteExclusion); return; } @@ -708,11 +708,11 @@ public class NeutronL3Adapter { Status status; if (isInbound) { status = inboundNatProvider == null ? new Status(StatusCode.SUCCESS) : - inboundNatProvider.programIpRewriteExclusion(node, dpid, providerSegmentationId, cidr, + inboundNatProvider.programIpRewriteExclusion(dpid, providerSegmentationId, cidr, actionForNode); } else { status = outboundNatProvider == null ? new Status(StatusCode.SUCCESS) : - outboundNatProvider.programIpRewriteExclusion(node, dpid, providerSegmentationId, cidr, + outboundNatProvider.programIpRewriteExclusion(dpid, providerSegmentationId, cidr, actionForNode); } @@ -739,13 +739,13 @@ public class NeutronL3Adapter { if (actionForNodeDefaultRoute == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programDefaultRouteStage1 node {} providerId {} mac {} gw {} action {} is already done", - node.getId().getValue(), providerSegmentationId, defaultGatewayMacAddress, gatewayIp, + node.getNodeId().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.getId().getValue(), providerSegmentationId, defaultGatewayMacAddress, gatewayIp, + node.getNodeId().getValue(), providerSegmentationId, defaultGatewayMacAddress, gatewayIp, actionForNodeDefaultRoute); return; } @@ -778,7 +778,7 @@ public class NeutronL3Adapter { InetAddress inetAddress = InetAddress.getByName(gatewayIp); status = routingProvider == null ? new Status(StatusCode.SUCCESS) : - routingProvider.programDefaultRouteEntry(node, dpid, providerSegmentationId, + routingProvider.programDefaultRouteEntry(dpid, providerSegmentationId, defaultGatewayMacAddress, inetAddress, actionForNodeDefaultRoute); } catch (UnknownHostException e) { @@ -863,14 +863,14 @@ public class NeutronL3Adapter { if (actionForNode == Action.DELETE && isProgrammed == Boolean.FALSE) { logger.trace("programIpRewriteStage1 node {} providerId {} {} matchAddr {} rewriteAddr {} action {}" + " is already done", - node.getId().getValue(), providerSegmentationId, isInbound ? "inbound": "outbound", + node.getNodeId().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.getId().getValue(), providerSegmentationId, isInbound ? "inbound": "outbound", + node.getNodeId().getValue(), providerSegmentationId, isInbound ? "inbound": "outbound", matchAddress, rewriteAddress, actionForNode); return; } @@ -906,12 +906,12 @@ public class NeutronL3Adapter { if (isInbound) { status = inboundNatProvider == null ? new Status(StatusCode.SUCCESS) : - inboundNatProvider.programIpRewriteRule(node, dpid, providerSegmentationId, + inboundNatProvider.programIpRewriteRule(dpid, providerSegmentationId, inetMatchAddress, inetRewriteAddress, actionForNode); } else { status = outboundNatProvider == null ? new Status(StatusCode.SUCCESS) : - outboundNatProvider.programIpRewriteRule(node, dpid, providerSegmentationId, + outboundNatProvider.programIpRewriteRule(dpid, providerSegmentationId, inetMatchAddress, inetRewriteAddress, actionForNode); } } catch (UnknownHostException e) { diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java index dae5b6e61..ff71536da 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java @@ -65,7 +65,7 @@ public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseabl private void notifyNodeAdded(Node node) { Set mdsalConsumerListeners = OvsdbInventoryServiceImpl.getMdsalConsumerListeners(); for (OvsdbInventoryListener mdsalConsumerListener : mdsalConsumerListeners) { - mdsalConsumerListener.ovsdbNodeAdded(inventoryNodeFromTopology(node)); + mdsalConsumerListener.ovsdbNodeAdded(node); } } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java index fbdaaca91..954ecd4dd 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java @@ -18,7 +18,7 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerCo import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer; import org.opendaylight.ovsdb.openstack.netvirt.api.MdsalConsumer; import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryListener; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbNode.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbNode.java new file mode 100644 index 000000000..f4e920347 --- /dev/null +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbNode.java @@ -0,0 +1,15 @@ +package org.opendaylight.ovsdb.openstack.netvirt.impl; + +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; + +public class OvsdbNode { + private Node node; + + OvsdbNode(Node node) { + this.node = node; + } + + public String getNodeId() { + return node.getNodeId().getValue(); + } +} 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 5d4288ea7..960c50290 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,10 @@ package org.opendaylight.ovsdb.openstack.netvirt.impl; import java.util.HashMap; import java.util.Map; -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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 a7a7e7dff..bc5cfd8c0 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 @@ -24,7 +24,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache; 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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 ec3a8f1a0..64f8ad034 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 @@ -21,7 +21,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache; 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 org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.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 23596ed2c..3cb6625cc 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 @@ -20,7 +20,6 @@ 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.ovsdb.lib.notation.Column; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; @@ -31,7 +30,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager; 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 org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImplTest.java index 629a91edf..af27a3473 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImplTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImplTest.java @@ -29,8 +29,8 @@ import org.opendaylight.ovsdb.lib.schema.GenericTableSchema; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch; import org.opendaylight.ovsdb.utils.config.ConfigProperties; -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.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -80,10 +80,12 @@ public class ConfigurationServiceImplTest { NodeId nodeId = mock(NodeId.class); PowerMockito.mockStatic(ConfigProperties.class); - when(node.getId()).thenReturn(nodeId); + when(node.getNodeId()).thenReturn(nodeId); when(nodeId.getValue()).thenReturn("nodeIdValue"); - PowerMockito.when(ConfigProperties.getProperty(configurationServiceImpl.getClass(), "ovsdb.l3gateway.mac." + node.getId().getValue())).thenReturn("gateway"); + PowerMockito.when(ConfigProperties.getProperty(configurationServiceImpl.getClass(), + "ovsdb.l3gateway.mac." + node.getNodeId().getValue())).thenReturn("gateway"); - assertEquals("Error, did not return the defaultGatewayMacAddress of the node", "gateway", configurationServiceImpl.getDefaultGatewayMacAddress(node)); + assertEquals("Error, did not return the defaultGatewayMacAddress of the node", "gateway", + configurationServiceImpl.getDefaultGatewayMacAddress(node)); } } diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java index f5ca274e4..3765e8dd9 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java @@ -48,8 +48,8 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.Status; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; import org.opendaylight.ovsdb.utils.config.ConfigProperties; -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.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -172,7 +172,7 @@ public class NeutronL3AdapterTest { when(tenantNetworkManager.isTenantNetworkPresentInNode(any(Node.class), anyString())).thenReturn(false); when(tenantNetworkManager.isTenantNetworkPresentInNode(any(Node.class), anyString())).thenReturn(true); - when(node.getId()).thenReturn(nodeID); + when(node.getNodeId()).thenReturn(nodeID); when(nodeID.getValue()).thenReturn("nodeId"); diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImplTest.java index db1b62955..3a32a9e0e 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImplTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImplTest.java @@ -21,7 +21,7 @@ import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.runners.MockitoJUnitRunner; import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.osgi.framework.ServiceReference; /** diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java index 4a5e4a330..0646027ed 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java @@ -47,7 +47,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache; import org.opendaylight.ovsdb.schema.openvswitch.Bridge; 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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; /** * Unit test for {@link TenantNetworkManagerImpl} diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImplTest.java index 0af7206bf..a37da63ad 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImplTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImplTest.java @@ -32,7 +32,7 @@ import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.lib.schema.GenericTableSchema; 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.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; /** * Unit test for {@link VlanConfigurationCacheImpl} -- 2.36.6