[ONOS-7553] Support injecting physical interfaces to openstack node
Change-Id: I5d746e9b4fa6015dbaec90d27ea7e1a7fa105e31
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
index 9c55df3..fccfd1b 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import com.google.common.util.concurrent.MoreExecutors;
import org.junit.After;
import org.junit.Before;
@@ -69,6 +70,7 @@
import org.onosproject.net.provider.ProviderId;
import org.onosproject.openstacknode.api.NodeState;
import org.onosproject.openstacknode.api.OpenstackNode;
+import org.onosproject.openstacknode.api.OpenstackPhyInterface;
import org.onosproject.ovsdb.controller.OvsdbClientService;
import org.onosproject.ovsdb.controller.OvsdbController;
@@ -144,6 +146,10 @@
private static final String GATEWAY_UPLINK_PORT = "eth0";
+ private static final Set<OpenstackPhyInterface> COMPUTE_1_PHY_INTFS = createPhyIntfs();
+ private static final Set<OpenstackPhyInterface> COMPUTE_2_PHY_INTFS = createPhyIntfs();
+ private static final Set<OpenstackPhyInterface> COMPUTE_3_PHY_INTFS = createPhyIntfs();
+
private static final Device COMPUTE_1_INTG_DEVICE = createOpenFlowDevice(1, INTEGRATION_BRIDGE);
private static final Device COMPUTE_2_INTG_DEVICE = createOpenFlowDevice(2, INTEGRATION_BRIDGE);
private static final Device COMPUTE_3_INTG_DEVICE = createOpenFlowDevice(3, INTEGRATION_BRIDGE);
@@ -161,7 +167,8 @@
COMPUTE,
COMPUTE_1_INTG_DEVICE,
COMPUTE_1_IP,
- INIT
+ INIT,
+ COMPUTE_1_PHY_INTFS
);
private static final OpenstackNode COMPUTE_2 = createNode(
@@ -169,7 +176,8 @@
COMPUTE,
COMPUTE_2_INTG_DEVICE,
COMPUTE_2_IP,
- DEVICE_CREATED
+ DEVICE_CREATED,
+ COMPUTE_2_PHY_INTFS
);
private static final OpenstackNode COMPUTE_3 = createNode(
@@ -177,10 +185,11 @@
COMPUTE,
COMPUTE_3_INTG_DEVICE,
COMPUTE_3_IP,
- COMPLETE
+ COMPLETE,
+ COMPUTE_3_PHY_INTFS
);
- private static final OpenstackNode GATEWAY_1 = createNode(
+ private static final OpenstackNode GATEWAY_1 = createGatewayNode(
GATEWAY_1_HOSTNAME,
GATEWAY,
GATEWAY_1_INTG_DEVICE,
@@ -189,7 +198,7 @@
INIT
);
- private static final OpenstackNode GATEWAY_2 = createNode(
+ private static final OpenstackNode GATEWAY_2 = createGatewayNode(
GATEWAY_2_HOSTNAME,
GATEWAY,
GATEWAY_2_INTG_DEVICE,
@@ -198,7 +207,7 @@
DEVICE_CREATED
);
- private static final OpenstackNode GATEWAY_3 = createNode(
+ private static final OpenstackNode GATEWAY_3 = createGatewayNode(
GATEWAY_3_HOSTNAME,
GATEWAY,
GATEWAY_3_INTG_DEVICE,
@@ -382,21 +391,26 @@
DefaultAnnotations.builder().set(PORT_NAME, portName).build());
}
+ private static Set<OpenstackPhyInterface> createPhyIntfs() {
+ return Sets.newConcurrentHashSet();
+ }
+
private static OpenstackNode createNode(String hostname,
OpenstackNode.NodeType type,
Device intgBridge,
IpAddress ipAddr,
- NodeState state) {
+ NodeState state,
+ Set<OpenstackPhyInterface> phyIntfs) {
return new TestOpenstackNode(
hostname,
type,
intgBridge.id(),
ipAddr,
ipAddr,
- null, null, state);
+ null, null, state, phyIntfs);
}
- private static OpenstackNode createNode(String hostname,
+ private static OpenstackNode createGatewayNode(String hostname,
OpenstackNode.NodeType type,
Device intgBridge,
IpAddress ipAddr,
@@ -408,7 +422,7 @@
intgBridge.id(),
ipAddr,
ipAddr,
- null, uplinkPort, state);
+ null, uplinkPort, state, null);
}
private static final class TestDevice extends DefaultDevice {
@@ -465,7 +479,8 @@
IpAddress dataIp,
String vlanIntf,
String uplinkPort,
- NodeState state) {
+ NodeState state,
+ Set<OpenstackPhyInterface> phyIntfs) {
super(hostname,
type,
intgBridge,
@@ -473,7 +488,8 @@
dataIp,
vlanIntf,
uplinkPort,
- state);
+ state,
+ phyIntfs);
}
@Override
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackPhyInterfaceTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackPhyInterfaceTest.java
new file mode 100644
index 0000000..55a7077
--- /dev/null
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackPhyInterfaceTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.openstacknode.impl;
+
+import com.google.common.testing.EqualsTester;
+import org.junit.Test;
+import org.onosproject.openstacknode.api.OpenstackPhyInterface;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Unit tests for DefaultOpenstackPhyInterface.
+ */
+public class DefaultOpenstackPhyInterfaceTest {
+
+ private static final String NETWORK_1 = "mgmtnetwork";
+ private static final String NETWORK_2 = "oamnetwork";
+ private static final String INTERFACE_1 = "eth3";
+ private static final String INTERFACE_2 = "eth4";
+
+ private static final OpenstackPhyInterface OS_PHY_INTF_1 =
+ new DefaultOpenstackPhyInterface(NETWORK_1, INTERFACE_1);
+ private static final OpenstackPhyInterface OS_PHY_INTF_2 =
+ new DefaultOpenstackPhyInterface(NETWORK_1, INTERFACE_1);
+ private static final OpenstackPhyInterface OS_PHY_INTF_3 =
+ new DefaultOpenstackPhyInterface(NETWORK_2, INTERFACE_2);
+
+ @Test
+ public void testEquality() {
+ new EqualsTester().addEqualityGroup(OS_PHY_INTF_1, OS_PHY_INTF_2)
+ .addEqualityGroup(OS_PHY_INTF_3)
+ .testEquals();
+ }
+
+ @Test
+ public void testConstruction() {
+ DefaultOpenstackPhyInterface phyIntf = (DefaultOpenstackPhyInterface)
+ OS_PHY_INTF_1;
+
+ assertThat(phyIntf.network(), is(NETWORK_1));
+ assertThat(phyIntf.intf(), is(INTERFACE_1));
+ }
+}
\ No newline at end of file