| commit | 621f73cb1456f441fdd697725195af0adfd0eaf7 | [log] [tgz] |
|---|---|---|
| author | Jian Li <pyguni@gmail.com> | Sat Dec 15 01:49:22 2018 +0900 |
| committer | Jian Li <pyguni@gmail.com> | Thu Dec 27 13:28:36 2018 +0900 |
| tree | 324f8af54e501f3639484ded9c810c566df852d1 | |
| parent | 6bc5c4a02bb83ec9b2b5f52759efda7f53308490 [diff] |
[ONOS-7863] Initial support GENEVE tunnel at SONA Change-Id: Ia85d32e8068c22d59082dceccc0d911f8acb5f02
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 e78d0e6..8decf3a 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
@@ -28,6 +28,7 @@ public static final String ROUTER_BRIDGE = "br-router"; public static final String VXLAN_TUNNEL = "vxlan"; public static final String GRE_TUNNEL = "gre"; + public static final String GENEVE_TUNNEL = "geneve"; public static final String PATCH_INTG_BRIDGE = "patch-intg"; public static final String PATCH_ROUT_BRIDGE = "patch-rout"; public static final String GATEWAY = "GATEWAY";
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java index 1ea5942..5d79f7d 100644 --- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java +++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java
@@ -35,6 +35,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static org.onosproject.net.AnnotationKeys.PORT_MAC; import static org.onosproject.net.AnnotationKeys.PORT_NAME; +import static org.onosproject.openstacknode.api.Constants.GENEVE_TUNNEL; 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.PATCH_INTG_BRIDGE; @@ -193,6 +194,11 @@ } @Override + public PortNumber geneveTunnelPortNum() { + return tunnelPortNum(GENEVE_TUNNEL); + } + + @Override public PortNumber greTunnelPortNum() { return tunnelPortNum(GRE_TUNNEL);
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java index 63f8ef2..2578eb8 100644 --- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java +++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java
@@ -109,6 +109,13 @@ PortNumber vxlanTunnelPortNum(); /** + * Returns the GENEVE tunnel port number. + * + * @return GENEVE port number; null if the GRE tunnel port does not exist + */ + PortNumber geneveTunnelPortNum(); + + /** * Returns the vlan port number. * * @return port number; null if vlan port does not exist