[ONOS-5731] Implement skeleton of VirtualNetworkPacketManager
Changes
1. Added VirtualNetworkPacketManager
2. Added VirtualNetworkPacketStore interface and impl class
3. Added VirtualPacketStore impl
4. Simple test cases are added
Todo
1. More test cases
Change-Id: I86f0484a9ee038dab8716703f0e5e41cbcf30cb1
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManagerTest.java
index e319e30..44099e3 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManagerTest.java
@@ -71,6 +71,7 @@
manager = new VirtualNetworkManager();
manager.store = virtualNetworkManagerStore;
manager.intentService = intentService;
+ manager.coreService = coreService;
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());
testDirectory = new TestServiceDirectory();
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowRuleManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowRuleManagerTest.java
index 0afc6ea..fa93335 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowRuleManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowRuleManagerTest.java
@@ -33,9 +33,6 @@
import org.onosproject.core.CoreService;
import org.onosproject.event.EventDeliveryService;
import org.onosproject.incubator.net.virtual.NetworkId;
-import org.onosproject.incubator.net.virtual.TenantId;
-import org.onosproject.incubator.net.virtual.VirtualDevice;
-import org.onosproject.incubator.net.virtual.VirtualLink;
import org.onosproject.incubator.net.virtual.VirtualNetwork;
import org.onosproject.incubator.net.virtual.VirtualNetworkFlowRuleStore;
import org.onosproject.incubator.net.virtual.VirtualNetworkStore;
@@ -48,12 +45,8 @@
import org.onosproject.incubator.net.virtual.provider.VirtualProviderRegistryService;
import org.onosproject.incubator.store.virtual.impl.DistributedVirtualNetworkStore;
import org.onosproject.incubator.store.virtual.impl.SimpleVirtualFlowRuleStore;
-import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
-import org.onosproject.net.Link;
import org.onosproject.net.NetTestTools;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.TestDeviceParams;
import org.onosproject.net.flow.DefaultFlowEntry;
import org.onosproject.net.flow.DefaultFlowRule;
import org.onosproject.net.flow.FlowEntry;
@@ -83,7 +76,7 @@
import static org.junit.Assert.*;
import static org.onosproject.net.flow.FlowRuleEvent.Type.*;
-public class VirtualNetworkFlowRuleManagerTest extends TestDeviceParams {
+public class VirtualNetworkFlowRuleManagerTest extends VirtualNetworkTestUtil {
private static final int TIMEOUT = 10;
private VirtualNetworkManager manager;
@@ -107,9 +100,6 @@
protected TestFlowRuleListener listener1 = new TestFlowRuleListener();
protected TestFlowRuleListener listener2 = new TestFlowRuleListener();
- private final TenantId tid1 = TenantId.tenantId("tid1");
- private final TenantId tid2 = TenantId.tenantId("tid2");
-
private VirtualNetwork vnet1;
private VirtualNetwork vnet2;
@@ -150,8 +140,8 @@
manager.activate();
- vnet1 = setupVirtualNetworkTopology(tid1);
- vnet2 = setupVirtualNetworkTopology(tid2);
+ vnet1 = setupVirtualNetworkTopology(manager, TID1);
+ vnet2 = setupVirtualNetworkTopology(manager, TID2);
vnetFlowRuleService1 = new VirtualNetworkFlowRuleManager(manager, vnet1.id());
vnetFlowRuleService2 = new VirtualNetworkFlowRuleManager(manager, vnet2.id());
@@ -175,60 +165,8 @@
virtualNetworkManagerStore.deactivate();
}
- /**
- * Method to create the virtual network for further testing.
- *
- * @return virtual network
- */
- private VirtualNetwork setupVirtualNetworkTopology(TenantId tenantId) {
- manager.registerTenantId(tenantId);
- VirtualNetwork virtualNetwork = manager.createVirtualNetwork(tenantId);
-
- VirtualDevice virtualDevice1 =
- manager.createVirtualDevice(virtualNetwork.id(), DID1);
- VirtualDevice virtualDevice2 =
- manager.createVirtualDevice(virtualNetwork.id(), DID2);
- VirtualDevice virtualDevice3 =
- manager.createVirtualDevice(virtualNetwork.id(), DID3);
- VirtualDevice virtualDevice4 =
- manager.createVirtualDevice(virtualNetwork.id(), DID4);
-
- ConnectPoint cp1 = new ConnectPoint(virtualDevice1.id(), PortNumber.portNumber(1));
- manager.createVirtualPort(virtualNetwork.id(), cp1.deviceId(), cp1.port(), cp1);
-
- ConnectPoint cp2 = new ConnectPoint(virtualDevice1.id(), PortNumber.portNumber(2));
- manager.createVirtualPort(virtualNetwork.id(), cp2.deviceId(), cp2.port(), cp2);
-
- ConnectPoint cp3 = new ConnectPoint(virtualDevice2.id(), PortNumber.portNumber(3));
- manager.createVirtualPort(virtualNetwork.id(), cp3.deviceId(), cp3.port(), cp3);
-
- ConnectPoint cp4 = new ConnectPoint(virtualDevice2.id(), PortNumber.portNumber(4));
- manager.createVirtualPort(virtualNetwork.id(), cp4.deviceId(), cp4.port(), cp4);
-
- ConnectPoint cp5 = new ConnectPoint(virtualDevice3.id(), PortNumber.portNumber(5));
- manager.createVirtualPort(virtualNetwork.id(), cp5.deviceId(), cp5.port(), cp5);
-
- ConnectPoint cp6 = new ConnectPoint(virtualDevice3.id(), PortNumber.portNumber(6));
- manager.createVirtualPort(virtualNetwork.id(), cp6.deviceId(), cp6.port(), cp6);
-
- VirtualLink link1 = manager.createVirtualLink(virtualNetwork.id(), cp1, cp3);
- virtualNetworkManagerStore.updateLink(link1, link1.tunnelId(), Link.State.ACTIVE);
- VirtualLink link2 = manager.createVirtualLink(virtualNetwork.id(), cp3, cp1);
- virtualNetworkManagerStore.updateLink(link2, link2.tunnelId(), Link.State.ACTIVE);
- VirtualLink link3 = manager.createVirtualLink(virtualNetwork.id(), cp4, cp5);
- virtualNetworkManagerStore.updateLink(link3, link3.tunnelId(), Link.State.ACTIVE);
- VirtualLink link4 = manager.createVirtualLink(virtualNetwork.id(), cp5, cp4);
- virtualNetworkManagerStore.updateLink(link4, link4.tunnelId(), Link.State.ACTIVE);
- VirtualLink link5 = manager.createVirtualLink(virtualNetwork.id(), cp2, cp6);
- virtualNetworkManagerStore.updateLink(link5, link5.tunnelId(), Link.State.ACTIVE);
- VirtualLink link6 = manager.createVirtualLink(virtualNetwork.id(), cp6, cp2);
- virtualNetworkManagerStore.updateLink(link6, link6.tunnelId(), Link.State.ACTIVE);
-
- return virtualNetwork;
- }
-
private FlowRule flowRule(int tsval, int trval) {
- return flowRule(DID1, tsval, trval);
+ return flowRule(VDID1, tsval, trval);
}
private FlowRule flowRule(DeviceId did, int tsval, int trval) {
@@ -248,22 +186,22 @@
FlowRule rule = flowRule(hval, hval);
vnetFlowRuleService1.applyFlowRules(rule);
- assertNotNull("rule should be found", vnetFlowRuleService1.getFlowEntries(DID1));
+ assertNotNull("rule should be found", vnetFlowRuleService1.getFlowEntries(VDID1));
return rule;
}
private int flowCount(FlowRuleService service) {
List<FlowEntry> entries = Lists.newArrayList();
- service.getFlowEntries(DID1).forEach(entries::add);
+ service.getFlowEntries(VDID1).forEach(entries::add);
return entries.size();
}
@Test
public void getFlowEntries() {
assertTrue("store should be empty",
- Sets.newHashSet(vnetFlowRuleService1.getFlowEntries(DID1)).isEmpty());
+ Sets.newHashSet(vnetFlowRuleService1.getFlowEntries(VDID1)).isEmpty());
assertTrue("store should be empty",
- Sets.newHashSet(vnetFlowRuleService2.getFlowEntries(DID1)).isEmpty());
+ Sets.newHashSet(vnetFlowRuleService2.getFlowEntries(VDID1)).isEmpty());
FlowRule f1 = addFlowRule(1);
FlowRule f2 = addFlowRule(2);
@@ -274,7 +212,7 @@
assertEquals("2 rules should exist", 2, flowCount(vnetFlowRuleService1));
assertEquals("0 rules should exist", 0, flowCount(vnetFlowRuleService2));
- providerService1.pushFlowMetrics(DID1, ImmutableList.of(fe1, fe2));
+ providerService1.pushFlowMetrics(VDID1, ImmutableList.of(fe1, fe2));
validateEvents(listener1, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED,
RULE_ADDED, RULE_ADDED);
@@ -283,7 +221,7 @@
System.err.println("events :" + listener1.events);
assertEquals("0 rules should exist", 0, flowCount(vnetFlowRuleService2));
- providerService1.pushFlowMetrics(DID1, ImmutableList.of(fe1));
+ providerService1.pushFlowMetrics(VDID1, ImmutableList.of(fe1));
validateEvents(listener1, RULE_UPDATED, RULE_UPDATED);
}
@@ -313,10 +251,10 @@
FlowEntry fe1 = new DefaultFlowEntry(f1);
FlowEntry fe2 = new DefaultFlowEntry(f2);
FlowEntry fe3 = new DefaultFlowEntry(f3);
- providerService1.pushFlowMetrics(DID1, ImmutableList.of(fe1, fe2, fe3));
+ providerService1.pushFlowMetrics(VDID1, ImmutableList.of(fe1, fe2, fe3));
validateEvents(listener1, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED,
RULE_ADDED, RULE_ADDED, RULE_ADDED);
- vnetFlowRuleService1.purgeFlowRules(DID1);
+ vnetFlowRuleService1.purgeFlowRules(VDID1);
assertEquals("0 rule should exist", 0, flowCount(vnetFlowRuleService1));
}
@@ -330,7 +268,7 @@
FlowEntry fe1 = new DefaultFlowEntry(f1);
FlowEntry fe2 = new DefaultFlowEntry(f2);
FlowEntry fe3 = new DefaultFlowEntry(f3);
- providerService1.pushFlowMetrics(DID1, ImmutableList.of(fe1, fe2, fe3));
+ providerService1.pushFlowMetrics(VDID1, ImmutableList.of(fe1, fe2, fe3));
validateEvents(listener1, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED,
RULE_ADDED, RULE_ADDED, RULE_ADDED);
@@ -355,7 +293,7 @@
StoredFlowEntry fe1 = new DefaultFlowEntry(f1);
FlowEntry fe2 = new DefaultFlowEntry(f2);
- providerService1.pushFlowMetrics(DID1, ImmutableList.of(fe1, fe2));
+ providerService1.pushFlowMetrics(VDID1, ImmutableList.of(fe1, fe2));
vnetFlowRuleService1.removeFlowRules(f1);
//FIXME modification of "stored" flow entry outside of store
@@ -373,7 +311,7 @@
FlowEntry fe3 = new DefaultFlowEntry(f3);
vnetFlowRuleService1.applyFlowRules(f3);
- providerService1.pushFlowMetrics(DID1, Collections.singletonList(fe3));
+ providerService1.pushFlowMetrics(VDID1, Collections.singletonList(fe3));
validateEvents(listener1, RULE_ADD_REQUESTED, RULE_ADDED, RULE_UPDATED);
providerService1.flowRemoved(fe3);
@@ -392,7 +330,7 @@
FlowEntry fe3 = new DefaultFlowEntry(f3);
- providerService1.pushFlowMetrics(DID1, Lists.newArrayList(fe1, fe2, fe3));
+ providerService1.pushFlowMetrics(VDID1, Lists.newArrayList(fe1, fe2, fe3));
validateEvents(listener1, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED,
RULE_ADDED, RULE_ADDED);
@@ -414,7 +352,7 @@
vnetFlowRuleService1.removeFlowRules(f3);
- providerService1.pushFlowMetrics(DID1, Lists.newArrayList(fe1, fe2));
+ providerService1.pushFlowMetrics(VDID1, Lists.newArrayList(fe1, fe2));
validateEvents(listener1, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED, RULE_ADD_REQUESTED,
RULE_REMOVE_REQUESTED, RULE_ADDED, RULE_ADDED, RULE_REMOVED);
@@ -439,7 +377,7 @@
private boolean validateState(Map<FlowRule, FlowEntry.FlowEntryState> expected) {
Map<FlowRule, FlowEntry.FlowEntryState> expectedToCheck = new HashMap<>(expected);
- Iterable<FlowEntry> rules = vnetFlowRuleService1.getFlowEntries(DID1);
+ Iterable<FlowEntry> rules = vnetFlowRuleService1.getFlowEntries(VDID1);
for (FlowEntry f : rules) {
assertTrue("Unexpected FlowRule " + f, expectedToCheck.containsKey(f));
assertEquals("FlowEntry" + f, expectedToCheck.get(f), f.state());
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostManagerTest.java
index ed0f3c2..01611f3 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkHostManagerTest.java
@@ -66,6 +66,7 @@
manager = new VirtualNetworkManager();
manager.store = virtualNetworkManagerStore;
manager.intentService = intentService;
+ manager.coreService = coreService;
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());
testDirectory = new TestServiceDirectory();
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkManagerTest.java
index 70f1c1b..a2062d9 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkLinkManagerTest.java
@@ -72,6 +72,7 @@
manager = new VirtualNetworkManager();
manager.store = virtualNetworkManagerStore;
manager.intentService = intentService;
+ manager.coreService = coreService;
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());
testDirectory = new TestServiceDirectory();
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java
index 6bf9ed2..158fcef 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java
@@ -104,6 +104,7 @@
manager.store = virtualNetworkManagerStore;
manager.addListener(listener);
manager.intentService = intentService;
+ manager.coreService = coreService;
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());
testDirectory = new TestServiceDirectory();
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPacketManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPacketManagerTest.java
new file mode 100644
index 0000000..b9771e4
--- /dev/null
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPacketManagerTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.incubator.net.virtual.impl;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.junit.TestUtils;
+import org.onlab.osgi.TestServiceDirectory;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ClusterServiceAdapter;
+import org.onosproject.common.event.impl.TestEventDispatcher;
+import org.onosproject.core.CoreService;
+import org.onosproject.core.CoreServiceAdapter;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.VirtualNetwork;
+import org.onosproject.incubator.net.virtual.VirtualNetworkPacketStore;
+import org.onosproject.incubator.net.virtual.VirtualNetworkStore;
+import org.onosproject.incubator.net.virtual.impl.provider.VirtualProviderManager;
+import org.onosproject.incubator.net.virtual.provider.AbstractVirtualProvider;
+import org.onosproject.incubator.net.virtual.provider.VirtualPacketProvider;
+import org.onosproject.incubator.net.virtual.provider.VirtualProviderRegistryService;
+import org.onosproject.incubator.store.virtual.impl.DistributedVirtualNetworkStore;
+import org.onosproject.incubator.store.virtual.impl.SimpleVirtualPacketStore;
+import org.onosproject.net.NetTestTools;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.intent.FakeIntentManager;
+import org.onosproject.net.intent.TestableIntentService;
+import org.onosproject.net.packet.DefaultOutboundPacket;
+import org.onosproject.net.packet.OutboundPacket;
+import org.onosproject.net.packet.PacketContext;
+import org.onosproject.net.packet.PacketProcessor;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.service.TestStorageService;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.junit.Assert.*;
+
+public class VirtualNetworkPacketManagerTest extends VirtualNetworkTestUtil {
+
+ private static final int PROCESSOR_PRIORITY = 1;
+
+ private VirtualNetworkManager manager;
+ private DistributedVirtualNetworkStore virtualNetworkManagerStore;
+ private CoreService coreService = new TestCoreService();
+ private TestableIntentService intentService = new FakeIntentManager();
+ private TestServiceDirectory testDirectory;
+ private EventDeliveryService eventDeliveryService;
+ private VirtualProviderManager providerRegistryService;
+
+ private VirtualNetwork vnet1;
+ private VirtualNetwork vnet2;
+
+ private VirtualPacketProvider provider = new TestPacketProvider();
+ private VirtualNetworkPacketStore packetStore = new SimpleVirtualPacketStore();
+
+ private VirtualNetworkPacketManager packetManager1;
+ private VirtualNetworkPacketManager packetManager2;
+
+ @Before
+ public void setUp() throws TestUtils.TestUtilsException {
+ virtualNetworkManagerStore = new DistributedVirtualNetworkStore();
+
+ TestUtils.setField(virtualNetworkManagerStore, "coreService", coreService);
+ TestUtils.setField(virtualNetworkManagerStore, "storageService", new TestStorageService());
+ virtualNetworkManagerStore.activate();
+
+ manager = new VirtualNetworkManager();
+ manager.store = virtualNetworkManagerStore;
+ manager.coreService = coreService;
+ manager.intentService = intentService;
+ NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());
+
+ providerRegistryService = new VirtualProviderManager();
+ providerRegistryService.registerProvider(provider);
+
+ testDirectory = new TestServiceDirectory()
+ .add(VirtualNetworkStore.class, virtualNetworkManagerStore)
+ .add(CoreService.class, coreService)
+ .add(VirtualProviderRegistryService.class, providerRegistryService)
+ .add(EventDeliveryService.class, eventDeliveryService)
+ .add(ClusterService.class, new ClusterServiceAdapter())
+ .add(VirtualNetworkPacketStore.class, packetStore);
+ TestUtils.setField(manager, "serviceDirectory", testDirectory);
+
+ eventDeliveryService = new TestEventDispatcher();
+ NetTestTools.injectEventDispatcher(manager, eventDeliveryService);
+
+ manager.activate();
+
+ vnet1 = VirtualNetworkTestUtil.setupVirtualNetworkTopology(manager, TID1);
+ vnet2 = VirtualNetworkTestUtil.setupVirtualNetworkTopology(manager, TID2);
+
+ packetManager1 = new VirtualNetworkPacketManager(manager, vnet1.id());
+ packetManager2 = new VirtualNetworkPacketManager(manager, vnet2.id());
+ }
+
+ /**
+ * Tests the correct usage of addProcessor() for a outbound packet.
+ */
+ @Test
+ public void addProcessorTest() {
+ PacketProcessor testProcessor = new TestProcessor();
+ packetManager1.addProcessor(testProcessor, PROCESSOR_PRIORITY);
+
+ assertEquals("1 processor expected", 1,
+ packetManager1.getProcessors().size());
+ assertEquals("0 processor expected", 0,
+ packetManager2.getProcessors().size());
+
+ assertEquals("not equal packet processor", testProcessor,
+ packetManager1.getProcessors().get(0).processor());
+ assertEquals("not equal packet processor priority", PROCESSOR_PRIORITY,
+ packetManager1.getProcessors().get(0).priority());
+ }
+
+ /**
+ * Tests the correct usage of addProcessor() for a outbound packet.
+ */
+ @Test
+ public void removeProcessorTest() {
+ PacketProcessor testProcessor = new TestProcessor();
+ packetManager1.addProcessor(testProcessor, PROCESSOR_PRIORITY);
+
+ assertEquals("1 processor expected", 1,
+ packetManager1.getProcessors().size());
+ assertEquals("0 processor expected", 0,
+ packetManager2.getProcessors().size());
+
+ packetManager1.removeProcessor(testProcessor);
+
+ assertEquals("0 processor expected", 0,
+ packetManager1.getProcessors().size());
+ assertEquals("0 processor expected", 0,
+ packetManager2.getProcessors().size());
+ }
+
+ /**
+ * Tests the correct usage of emit() for a outbound packet.
+ */
+ @Test
+ public void emitTest() {
+ OutboundPacket packet =
+ new DefaultOutboundPacket(VDID1, DefaultTrafficTreatment.emptyTreatment(), ByteBuffer.allocate(5));
+ packetManager1.emit(packet);
+ assertEquals("Packet not emitted correctly", packet, emittedPacket);
+ }
+
+ private static OutboundPacket emittedPacket = null;
+
+ /**
+ * Core service test class.
+ */
+ private class TestCoreService extends CoreServiceAdapter {
+
+ @Override
+ public IdGenerator getIdGenerator(String topic) {
+ return new IdGenerator() {
+ private AtomicLong counter = new AtomicLong(0);
+
+ @Override
+ public long getNewId() {
+ return counter.getAndIncrement();
+ }
+ };
+ }
+ }
+
+ private class TestPacketProvider extends AbstractVirtualProvider
+ implements VirtualPacketProvider {
+
+ /**
+ * Creates a provider with the supplied identifier.
+ */
+ protected TestPacketProvider() {
+ super(new ProviderId("test-packet",
+ "org.onosproject.virtual.test-packet"));
+ }
+
+ @Override
+ public void emit(NetworkId networkId, OutboundPacket packet) {
+ emittedPacket = packet;
+ }
+ }
+
+ private class TestProcessor implements PacketProcessor {
+
+ @Override
+ public void process(PacketContext context) {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathManagerTest.java
index 768bc4d..1bff96f 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPathManagerTest.java
@@ -71,6 +71,7 @@
manager = new VirtualNetworkManager();
manager.store = virtualNetworkManagerStore;
manager.intentService = intentService;
+ manager.coreService = coreService;
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());
testDirectory = new TestServiceDirectory();
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTestUtil.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTestUtil.java
new file mode 100644
index 0000000..487cb6e
--- /dev/null
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTestUtil.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.incubator.net.virtual.impl;
+
+import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.incubator.net.virtual.VirtualDevice;
+import org.onosproject.incubator.net.virtual.VirtualLink;
+import org.onosproject.incubator.net.virtual.VirtualNetwork;
+import org.onosproject.incubator.store.virtual.impl.DistributedVirtualNetworkStore;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.TestDeviceParams;
+
+import static org.onosproject.net.DeviceId.deviceId;
+
+public class VirtualNetworkTestUtil extends TestDeviceParams {
+
+ protected static final TenantId TID1 = TenantId.tenantId("tid1");
+ protected static final TenantId TID2 = TenantId.tenantId("tid2");
+
+ protected static final DeviceId VDID1 = deviceId("of:foo_v");
+ protected static final DeviceId VDID2 = deviceId("of:bar_v");
+ protected static final DeviceId VDID3 = deviceId("of:who_v");
+ protected static final DeviceId VDID4 = deviceId("of:what_v");
+
+ /**
+ * Method to create the virtual network for further testing.
+ *
+ * @return virtual network
+ */
+ public static VirtualNetwork setupVirtualNetworkTopology(VirtualNetworkManager manager,
+ TenantId tenantId) {
+ manager.registerTenantId(tenantId);
+ VirtualNetwork virtualNetwork = manager.createVirtualNetwork(tenantId);
+
+ VirtualDevice virtualDevice1 =
+ manager.createVirtualDevice(virtualNetwork.id(), VDID1);
+ VirtualDevice virtualDevice2 =
+ manager.createVirtualDevice(virtualNetwork.id(), VDID2);
+ VirtualDevice virtualDevice3 =
+ manager.createVirtualDevice(virtualNetwork.id(), VDID3);
+ VirtualDevice virtualDevice4 =
+ manager.createVirtualDevice(virtualNetwork.id(), VDID4);
+
+ ConnectPoint vcp1 = new ConnectPoint(virtualDevice1.id(), PortNumber.portNumber(1));
+ ConnectPoint cp1 = new ConnectPoint(DID1, PortNumber.portNumber(1));
+ manager.createVirtualPort(virtualNetwork.id(), vcp1.deviceId(), vcp1.port(), cp1);
+
+ ConnectPoint vcp2 = new ConnectPoint(virtualDevice1.id(), PortNumber.portNumber(2));
+ ConnectPoint cp2 = new ConnectPoint(DID1, PortNumber.portNumber(2));
+ manager.createVirtualPort(virtualNetwork.id(), vcp2.deviceId(), vcp2.port(), cp2);
+
+ ConnectPoint vcp3 = new ConnectPoint(virtualDevice2.id(), PortNumber.portNumber(3));
+ ConnectPoint cp3 = new ConnectPoint(DID2, PortNumber.portNumber(1));
+ manager.createVirtualPort(virtualNetwork.id(), vcp3.deviceId(), vcp3.port(), cp3);
+
+ ConnectPoint vcp4 = new ConnectPoint(virtualDevice2.id(), PortNumber.portNumber(4));
+ ConnectPoint cp4 = new ConnectPoint(DID2, PortNumber.portNumber(2));
+ manager.createVirtualPort(virtualNetwork.id(), vcp4.deviceId(), vcp4.port(), cp4);
+
+ ConnectPoint vcp5 = new ConnectPoint(virtualDevice3.id(), PortNumber.portNumber(5));
+ ConnectPoint cp5 = new ConnectPoint(DID3, PortNumber.portNumber(1));
+ manager.createVirtualPort(virtualNetwork.id(), vcp5.deviceId(), vcp5.port(), cp5);
+
+ ConnectPoint vcp6 = new ConnectPoint(virtualDevice3.id(), PortNumber.portNumber(6));
+ ConnectPoint cp6 = new ConnectPoint(DID3, PortNumber.portNumber(2));
+ manager.createVirtualPort(virtualNetwork.id(), vcp6.deviceId(), vcp6.port(), cp6);
+
+ DistributedVirtualNetworkStore virtualNetworkManagerStore =
+ (DistributedVirtualNetworkStore) manager.store;
+ VirtualLink link1 = manager.createVirtualLink(virtualNetwork.id(), vcp1, vcp3);
+ virtualNetworkManagerStore.updateLink(link1, link1.tunnelId(), Link.State.ACTIVE);
+ VirtualLink link2 = manager.createVirtualLink(virtualNetwork.id(), vcp3, vcp1);
+ virtualNetworkManagerStore.updateLink(link2, link2.tunnelId(), Link.State.ACTIVE);
+ VirtualLink link3 = manager.createVirtualLink(virtualNetwork.id(), vcp4, vcp5);
+ virtualNetworkManagerStore.updateLink(link3, link3.tunnelId(), Link.State.ACTIVE);
+ VirtualLink link4 = manager.createVirtualLink(virtualNetwork.id(), vcp5, vcp4);
+ virtualNetworkManagerStore.updateLink(link4, link4.tunnelId(), Link.State.ACTIVE);
+ VirtualLink link5 = manager.createVirtualLink(virtualNetwork.id(), vcp2, vcp6);
+ virtualNetworkManagerStore.updateLink(link5, link5.tunnelId(), Link.State.ACTIVE);
+ VirtualLink link6 = manager.createVirtualLink(virtualNetwork.id(), vcp6, vcp2);
+ virtualNetworkManagerStore.updateLink(link6, link6.tunnelId(), Link.State.ACTIVE);
+
+ return virtualNetwork;
+ }
+}
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManagerTest.java
index 11bfdc8..ccbb71c 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkTopologyManagerTest.java
@@ -23,8 +23,10 @@
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.common.event.impl.TestEventDispatcher;
+import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.core.CoreServiceAdapter;
+import org.onosproject.core.DefaultApplicationId;
import org.onosproject.core.IdGenerator;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.incubator.net.virtual.TenantId;
@@ -82,6 +84,7 @@
manager = new VirtualNetworkManager();
manager.store = virtualNetworkManagerStore;
manager.intentService = intentService;
+ manager.coreService = coreService;
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());
testDirectory = new TestServiceDirectory();
@@ -613,6 +616,8 @@
*/
private class TestCoreService extends CoreServiceAdapter {
+ ApplicationId appId;
+
@Override
public IdGenerator getIdGenerator(String topic) {
return new IdGenerator() {
@@ -624,5 +629,17 @@
}
};
}
+
+ @Override
+ public ApplicationId registerApplication(String name) {
+ appId = new DefaultApplicationId(1, name);
+ return appId;
+ }
+
+ @Override
+ public ApplicationId getAppId(String name) {
+ return appId;
+ }
}
+
}
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualFlowRuleProviderTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualFlowRuleProviderTest.java
index 1a1c235..d8ae05d 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualFlowRuleProviderTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualFlowRuleProviderTest.java
@@ -26,10 +26,9 @@
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreService;
+import org.onosproject.core.CoreServiceAdapter;
import org.onosproject.core.DefaultApplicationId;
import org.onosproject.core.IdGenerator;
-import org.onosproject.core.Version;
import org.onosproject.incubator.net.virtual.DefaultVirtualDevice;
import org.onosproject.incubator.net.virtual.DefaultVirtualNetwork;
import org.onosproject.incubator.net.virtual.DefaultVirtualPort;
@@ -49,7 +48,6 @@
import org.onosproject.net.DefaultPort;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
-import org.onosproject.net.DisjointPath;
import org.onosproject.net.HostId;
import org.onosproject.net.HostLocation;
import org.onosproject.net.Link;
@@ -63,26 +61,20 @@
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.FlowEntry;
import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.FlowRuleListener;
-import org.onosproject.net.flow.FlowRuleOperations;
-import org.onosproject.net.flow.FlowRuleService;
-import org.onosproject.net.flow.TableStatisticsEntry;
+import org.onosproject.net.flow.FlowRuleServiceAdapter;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.L2ModificationInstruction;
import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.topology.ClusterId;
+import org.onosproject.net.topology.LinkWeigher;
import org.onosproject.net.topology.LinkWeight;
import org.onosproject.net.topology.Topology;
-import org.onosproject.net.topology.TopologyCluster;
-import org.onosproject.net.topology.TopologyGraph;
-import org.onosproject.net.topology.TopologyListener;
import org.onosproject.net.topology.TopologyServiceAdapter;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import static org.junit.Assert.assertEquals;
@@ -308,27 +300,7 @@
}
}
- private static class TestCoreService implements CoreService {
-
- @Override
- public Version version() {
- return null;
- }
-
- @Override
- public Set<ApplicationId> getAppIds() {
- return null;
- }
-
- @Override
- public ApplicationId getAppId(Short id) {
- return null;
- }
-
- @Override
- public ApplicationId getAppId(String name) {
- return null;
- }
+ private static class TestCoreService extends CoreServiceAdapter {
@Override
public ApplicationId registerApplication(String name) {
@@ -336,14 +308,15 @@
}
@Override
- public ApplicationId registerApplication(String name,
- Runnable preDeactivate) {
- return null;
- }
-
- @Override
public IdGenerator getIdGenerator(String topic) {
- return null;
+ return new IdGenerator() {
+ private AtomicLong counter = new AtomicLong(0);
+
+ @Override
+ public long getNewId() {
+ return counter.getAndIncrement();
+ }
+ };
}
}
@@ -393,6 +366,11 @@
}
@Override
+ public ApplicationId getVirtualNetworkApplicationId(NetworkId networkId) {
+ return null;
+ }
+
+ @Override
public void registerTenantId(TenantId tenantId) {
}
@@ -479,53 +457,6 @@
private static class TestTopologyService extends TopologyServiceAdapter {
@Override
- public void addListener(TopologyListener listener) {
-
- }
-
- @Override
- public void removeListener(TopologyListener listener) {
-
- }
-
- @Override
- public Topology currentTopology() {
- return null;
- }
-
- @Override
- public boolean isLatest(Topology topology) {
- return false;
- }
-
- @Override
- public TopologyGraph getGraph(Topology topology) {
- return null;
- }
-
- @Override
- public Set<TopologyCluster> getClusters(Topology topology) {
- return null;
- }
-
- @Override
- public TopologyCluster getCluster(Topology topology, ClusterId clusterId) {
- return null;
- }
-
- @Override
- public Set<DeviceId> getClusterDevices(Topology topology,
- TopologyCluster cluster) {
- return null;
- }
-
- @Override
- public Set<Link> getClusterLinks(Topology topology,
- TopologyCluster cluster) {
- return null;
- }
-
- @Override
public Set<Path> getPaths(Topology topology, DeviceId src, DeviceId dst) {
DefaultPath path = new DefaultPath(PID, ImmutableList.of(LINK1),
100, ANNOTATIONS);
@@ -541,58 +472,19 @@
}
@Override
- public Set<DisjointPath> getDisjointPaths(Topology topology,
- DeviceId src, DeviceId dst) {
- return null;
+ public Set<Path> getPaths(Topology topology, DeviceId src, DeviceId dst,
+ LinkWeigher weigher) {
+ DefaultPath path = new DefaultPath(PID, ImmutableList.of(LINK1),
+ 100, ANNOTATIONS);
+ return ImmutableSet.of(path);
}
- @Override
- public Set<DisjointPath> getDisjointPaths(Topology topology, DeviceId src,
- DeviceId dst, LinkWeight weight) {
- return null;
- }
-
- @Override
- public Set<DisjointPath> getDisjointPaths(Topology topology, DeviceId src,
- DeviceId dst,
- Map<Link, Object> riskProfile) {
- return null;
- }
-
- @Override
- public Set<DisjointPath> getDisjointPaths(Topology topology, DeviceId src,
- DeviceId dst, LinkWeight weight,
- Map<Link, Object> riskProfile) {
- return null;
- }
-
- @Override
- public boolean isInfrastructure(Topology topology,
- ConnectPoint connectPoint) {
- return false;
- }
-
- @Override
- public boolean isBroadcastPoint(Topology topology,
- ConnectPoint connectPoint) {
- return false;
- }
}
- private static class TestFlowRuleService implements FlowRuleService {
+ private static class TestFlowRuleService extends FlowRuleServiceAdapter {
static Set<FlowRule> ruleCollection = new HashSet<>();
@Override
- public void addListener(FlowRuleListener listener) {
-
- }
-
- @Override
- public void removeListener(FlowRuleListener listener) {
-
- }
-
- @Override
public int getFlowRuleCount() {
return ruleCollection.size();
}
@@ -613,11 +505,6 @@
}
@Override
- public void purgeFlowRules(DeviceId deviceId) {
-
- }
-
- @Override
public void removeFlowRules(FlowRule... flowRules) {
Set<FlowRule> candidates = new HashSet<>();
for (FlowRule rule : flowRules) {
@@ -627,37 +514,5 @@
}
ruleCollection.removeAll(candidates);
}
-
- @Override
- public void removeFlowRulesById(ApplicationId appId) {
-
- }
-
- @Override
- public Iterable<FlowRule> getFlowRulesById(ApplicationId id) {
- return null;
- }
-
- @Override
- public Iterable<FlowEntry> getFlowEntriesById(ApplicationId id) {
- return null;
- }
-
- @Override
- public Iterable<FlowRule> getFlowRulesByGroupId(ApplicationId appId,
- short groupId) {
- return null;
- }
-
- @Override
- public void apply(FlowRuleOperations ops) {
-
- }
-
- @Override
- public Iterable<TableStatisticsEntry>
- getFlowTableStatistics(DeviceId deviceId) {
- return null;
- }
}
}
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/VirtualNetworkTopologyProviderTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/VirtualNetworkTopologyProviderTest.java
index 1391506..5e2b33b 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/VirtualNetworkTopologyProviderTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/VirtualNetworkTopologyProviderTest.java
@@ -111,6 +111,7 @@
virtualNetworkManagerStore.activate();
manager = new VirtualNetworkManager();
+ TestUtils.setField(manager, "coreService", coreService);
TestUtils.setField(manager, "store", virtualNetworkManagerStore);
TestUtils.setField(manager, "intentService", intentService);
NetTestTools.injectEventDispatcher(manager, new TestEventDispatcher());