Add vlan to container flow (container flow-spec)

[controller.git] / opendaylight / northbound / containermanager / src / main / java / org / opendaylight / controller / containermanager / northbound / ContainerManagerNorthbound.java

diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java b/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java
index 77c3004c76b6928fb57631ffd1a4c99e4740a067..518fc4692f0d6e11c7a24a0f0551803791708945 100644 (file)
--- a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java
+++ b/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java
@@ -9,7 +9,6 @@
 
 package org.opendaylight.controller.containermanager.northbound;
 
 
 package org.opendaylight.controller.containermanager.northbound;
 

-import java.security.Principal;

 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;


@@ -364,6 +363,7 @@ public class ContainerManagerNorthbound {
      * Response body in XML:
      * <flow-spec-config>
      *      <name>ssh</name>
      * Response body in XML:
      * <flow-spec-config>
      *      <name>ssh</name>

+     *      <dlVlan>52</dlVlan>

      *      <nwSrc>10.0.0.101</nwSrc>
      *      <nwDst>10.0.0.102</nwDst>
      *      <protocol>IPv4</protocol>
      *      <nwSrc>10.0.0.101</nwSrc>
      *      <nwDst>10.0.0.102</nwDst>
      *      <protocol>IPv4</protocol>


@@ -374,6 +374,7 @@ public class ContainerManagerNorthbound {
      * Response body in JSON:
      * {
      *    "protocol" : "IPv4",
      * Response body in JSON:
      * {
      *    "protocol" : "IPv4",

+     *    "dlVlan" : "52",

      *    "nwDst" : "10.0.0.102",
      *    "name" : "ssh",
      *    "nwSrc" : "10.0.0.101",
      *    "nwDst" : "10.0.0.102",
      *    "name" : "ssh",
      *    "nwSrc" : "10.0.0.101",


@@ -429,6 +430,7 @@ public class ContainerManagerNorthbound {
      * <flow-spec-configs>
      *       <flow-spec-config>
      *           <name>ssh</name>
      * <flow-spec-configs>
      *       <flow-spec-config>
      *           <name>ssh</name>

+     *           <dlVlan>52</dlVlan>

      *           <nwSrc>10.0.0.101</nwSrc>
      *           <nwDst>10.0.0.102</nwDst>
      *           <protocol>IPv4</protocol>
      *           <nwSrc>10.0.0.101</nwSrc>
      *           <nwDst>10.0.0.102</nwDst>
      *           <protocol>IPv4</protocol>


@@ -437,6 +439,7 @@ public class ContainerManagerNorthbound {
      *       </flow-spec-config>
      *       <flow-spec-config>
      *           <name>http2</name>
      *       </flow-spec-config>
      *       <flow-spec-config>
      *           <name>http2</name>

+     *           <dlVlan>123</dlVlan>

      *           <nwSrc>10.0.0.201</nwSrc>
      *           <nwDst>10.0.0.202</nwDst>
      *           <protocol></protocol>
      *           <nwSrc>10.0.0.201</nwSrc>
      *           <nwDst>10.0.0.202</nwDst>
      *           <protocol></protocol>


@@ -450,6 +453,7 @@ public class ContainerManagerNorthbound {
      *   "flow-spec-config": [
      *     {
      *       "name": "http",
      *   "flow-spec-config": [
      *     {
      *       "name": "http",

+     *       "dlVlan" : "52",

      *       "nwSrc": "10.0.0.201",
      *       "nwDst": "10.0.0.202",
      *       "protocol": "",
      *       "nwSrc": "10.0.0.201",
      *       "nwDst": "10.0.0.202",
      *       "protocol": "",


@@ -458,6 +462,7 @@ public class ContainerManagerNorthbound {
      *     },
      *     {
      *       "name": "ssh",
      *     },
      *     {
      *       "name": "ssh",

+     *       "dlVlan" : "123",

      *       "nwSrc": "10.0.0.101",
      *       "nwDst": "10.0.0.102",
      *       "protocol": "IPv4",
      *       "nwSrc": "10.0.0.101",
      *       "nwDst": "10.0.0.102",
      *       "protocol": "IPv4",


@@ -511,6 +516,7 @@ public class ContainerManagerNorthbound {
      * Request body in XML:
      *   <flow-spec-config>
      *         <name>http</name>
      * Request body in XML:
      *   <flow-spec-config>
      *         <name>http</name>

+     *         <dlVlan>25</dlVlan>

      *         <nwSrc>10.0.0.101</nwSrc>
      *         <nwDst>10.0.0.102</nwDst>
      *         <protocol></protocol>
      *         <nwSrc>10.0.0.101</nwSrc>
      *         <nwDst>10.0.0.102</nwDst>
      *         <protocol></protocol>


@@ -520,10 +526,11 @@ public class ContainerManagerNorthbound {
      *
      * Request body in JSON:
      * {
      *
      * Request body in JSON:
      * {

-     *    "protocol" : "",
-     *    "nwDst" : "10.0.0.102",

      *    "name" : "http",
      *    "name" : "http",

+     *    "dlVlan" : "25",

      *    "nwSrc" : "10.0.0.101",
      *    "nwSrc" : "10.0.0.101",

+     *    "nwDst" : "10.0.0.102",
+     *    "protocol" : "",

      *    "tpSrc" : "80",
      *    "tpDst" : "100"
      * }
      *    "tpSrc" : "80",
      *    "tpDst" : "100"
      * }