Remove openstack4j NetworkType due to unsupport of GENEVE tunnel
Change-Id: Id3579b706480114b076fbe867040b9bf8c2c738f
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java
index 0422c65..e78d0e6 100644
--- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java
+++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java
@@ -38,4 +38,10 @@
public static final String DATA_IP = "dataIp";
public static final String VLAN_INTF_NAME = "vlanPort";
public static final String UPLINK_PORT = "uplinkPort";
+
+ public static final String FLAT = "flat";
+ public static final String VLAN = "vlan";
+ public static final String VXLAN = "vxlan";
+ public static final String GRE = "gre";
+ public static final String GENEVE = "geneve";
}
\ No newline at end of file
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
index c6e9395..1b93499 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
@@ -57,7 +57,6 @@
import org.onosproject.ovsdb.rfc.notation.OvsdbSet;
import org.onosproject.ovsdb.rfc.table.Interface;
import org.openstack4j.api.OSClient;
-import org.openstack4j.model.network.NetworkType;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -80,10 +79,12 @@
import static org.onlab.packet.TpPort.tpPort;
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.net.AnnotationKeys.PORT_NAME;
+import static org.onosproject.openstacknode.api.Constants.GRE;
import static org.onosproject.openstacknode.api.Constants.GRE_TUNNEL;
-import static org.onosproject.openstacknode.api.Constants.VXLAN_TUNNEL;
import static org.onosproject.openstacknode.api.Constants.INTEGRATION_BRIDGE;
import static org.onosproject.openstacknode.api.Constants.TUNNEL_BRIDGE;
+import static org.onosproject.openstacknode.api.Constants.VXLAN;
+import static org.onosproject.openstacknode.api.Constants.VXLAN_TUNNEL;
import static org.onosproject.openstacknode.api.DpdkConfig.DatapathType.NETDEV;
import static org.onosproject.openstacknode.api.NodeState.COMPLETE;
import static org.onosproject.openstacknode.api.NodeState.DEVICE_CREATED;
@@ -351,7 +352,7 @@
* @param osNode openstack node
*/
private void createVxlanTunnelInterface(OpenstackNode osNode) {
- createTunnelInterface(osNode, NetworkType.VXLAN, VXLAN_TUNNEL);
+ createTunnelInterface(osNode, VXLAN, VXLAN_TUNNEL);
}
/**
@@ -360,7 +361,7 @@
* @param osNode openstack node
*/
private void createGreTunnelInterface(OpenstackNode osNode) {
- createTunnelInterface(osNode, NetworkType.GRE, GRE_TUNNEL);
+ createTunnelInterface(osNode, GRE, GRE_TUNNEL);
}
/**
@@ -369,7 +370,7 @@
* @param osNode openstack node
*/
private void createTunnelInterface(OpenstackNode osNode,
- NetworkType type, String intfName) {
+ String type, String intfName) {
if (isIntfEnabled(osNode, intfName)) {
return;
}
@@ -392,8 +393,8 @@
* @param type network type
* @return tunnel description
*/
- private TunnelDescription buildTunnelDesc(NetworkType type, String intfName) {
- if (type == NetworkType.VXLAN || type == NetworkType.GRE) {
+ private TunnelDescription buildTunnelDesc(String type, String intfName) {
+ if (VXLAN.equals(type) || GRE.equals(type)) {
TunnelDescription.Builder tdBuilder =
DefaultTunnelDescription.builder()
.deviceId(INTEGRATION_BRIDGE)