Merge "Table features : modified yang model. Patch set 2: Modified match types as...

[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 518fc4692f0d6e11c7a24a0f0551803791708945..fe38361cca246465bf514686b0beb872e72dd9f5 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
@@ -114,8 +114,8 @@ public class ContainerManagerNorthbound {
      * http://localhost:8080/controller/nb/v2/containermanager/containers
      *
      * Response body in XML:
-     * <container-config-list>
-     *       <container-config>
+     * <containerConfig-list>
+     *       <containerConfig>
      *          <container>black</container>
      *          <staticVlan>10</staticVlan>
      *          <nodeConnectors>OF|1@OF|00:00:00:00:00:00:00:01</nodeConnectors>
@@ -124,8 +124,8 @@ public class ContainerManagerNorthbound {
      *           <name>tcp</name>
      *           <protocol>TCP</protocol>
      *          </flowSpecs>
-     *        </container-config>
-     *        <container-config>
+     *        </containerConfig>
+     *        <containerConfig>
      *          <container>red</container>
      *          <staticVlan>20</staticVlan>
      *          <nodeConnectors>OF|1@OF|00:00:00:00:00:00:00:01</nodeConnectors>
@@ -134,11 +134,11 @@ public class ContainerManagerNorthbound {
      *           <name>udp</name>
      *           <protocol>UDP</protocol>
      *          </flowSpecs>
-     *      </container-config>
-     * </container-config-list>
+     *      </containerConfig>
+     * </containerConfig-list>
      *
      * Response body in JSON:
-     * { "container-config" : [
+     * { "containerConfig" : [
      *     { "container" : "black",
      *       "nodeConnectors" : [
      *          "OF|1@OF|00:00:00:00:00:00:00:01", "OF|23@OF|00:00:00:00:00:00:20:21"
@@ -196,16 +196,16 @@ public class ContainerManagerNorthbound {
      * http://localhost:8080/controller/nb/v2/containermanager/container/blue
      *
      * Response body in XML:
-     * <container-config>
+     * <containerConfig>
      *      <container>blue</container>
      *      <staticVlan>10</staticVlan>
      *      <nodeConnectors>OF|1@OF|00:00:00:00:00:00:00:01</nodeConnectors>
      *      <nodeConnectors>OF|23@OF|00:00:00:00:00:00:20:21</nodeConnectors>
-     * </container-config>
+     * </containerConfig>
      *
      * Response body in JSON:
      * {
-     *    "container-config": [
+     *    "containerConfig": [
      *       {
      *        "container": "yellow",
      *        "staticVlan": "10",
@@ -259,11 +259,11 @@ public class ContainerManagerNorthbound {
      * http://localhost:8080/controller/nb/v2/containermanager/container/yellow
      *
      * Request body in XML:
-     * <container-config>
+     * <containerConfig>
      *       <container>yellow</container>
      *       <staticVlan>10</staticVlan>
      *       <nodeConnectors></nodeConnectors>
-     * </container-config>
+     * </containerConfig>
      *
      * Request body in JSON:
      * {