Supports dpdk-based vm creation in OpenstackNetworking service.
Change-Id: I39c30cde5b455952a4c7ed0147903324c6598880
diff --git a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java
index 0e291f8..daf0a9a 100644
--- a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java
+++ b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java
@@ -36,6 +36,7 @@
import org.onosproject.net.PortNumber;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.device.DeviceServiceAdapter;
+import org.onosproject.openstacknetworking.api.Constants;
import org.onosproject.openstacknetworking.api.InstancePort;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
import org.onosproject.openstacknetworking.api.OpenstackRouterAdminService;
@@ -84,6 +85,7 @@
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.routerInterfacesEquals;
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.swapStaleLocation;
+import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.vnicType;
public final class OpenstackNetworkingUtilTest {
@@ -438,6 +440,22 @@
}
+ /**
+ * Tests the vnicType method.
+ */
+ @Test
+ public void testVnicType() {
+ String portNameNormalTap = "tap123456789ab";
+ String portNameNormalVhu = "tap123456789ab";
+ String portNameNormalCavium = "enp1f2s3";
+ String portNameUnsupported = "123456789ab";
+
+ assertEquals(vnicType(portNameNormalTap), Constants.VnicType.NORMAL);
+ assertEquals(vnicType(portNameNormalVhu), Constants.VnicType.NORMAL);
+ assertEquals(vnicType(portNameNormalCavium), Constants.VnicType.DIRECT);
+ assertEquals(vnicType(portNameUnsupported), Constants.VnicType.UNSUPPORTED);
+ }
+
private DeviceId genDeviceId(int index) {
return DeviceId.deviceId("of:compute-" + index);
}
diff --git a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResourceTest.java b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResourceTest.java
index e3f4bf0..7d7a603 100644
--- a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResourceTest.java
+++ b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResourceTest.java
@@ -21,6 +21,7 @@
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
+import org.onosproject.openstacknode.api.OpenstackNodeService;
import org.onosproject.rest.resources.ResourceTest;
import javax.ws.rs.client.Entity;
@@ -45,6 +46,8 @@
final OpenstackNetworkAdminService mockOpenstackNetworkAdminService =
createMock(OpenstackNetworkAdminService.class);
+ final OpenstackNodeService mockOpenstackNodeService =
+ createMock(OpenstackNodeService.class);
private static final String PATH = "ports";
/**
@@ -59,10 +62,9 @@
*/
@Before
public void setUpTest() {
- ServiceDirectory testDirectory =
- new TestServiceDirectory()
- .add(OpenstackNetworkAdminService.class,
- mockOpenstackNetworkAdminService);
+ ServiceDirectory testDirectory = new TestServiceDirectory()
+ .add(OpenstackNetworkAdminService.class, mockOpenstackNetworkAdminService)
+ .add(OpenstackNodeService.class, mockOpenstackNodeService);
setServiceDirectory(testDirectory);
}