Fix bug 153: change the key container-config to ContainerConfig in the container...

Change-Id: Iaa9e7cf3d67363197b09440d52b887df8fd28f51
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>

diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java
index b82d2dae3cbf769a5e64239f178d6aaa3e7703f0..99568dfcce886fb89de47fba5cc775b00a24530a 100644 (file)
--- a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java
+++ b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java
@@ -35,7 +35,7 @@ import org.opendaylight.controller.sal.utils.StatusCode;
  * files through java serialization API when saving to/reading from Container
  * Manager startup configuration file.
  */
  * files through java serialization API when saving to/reading from Container
  * Manager startup configuration file.
  */

-@XmlRootElement(name = "container-config")
+@XmlRootElement(name = "containerConfig")

 @XmlAccessorType(XmlAccessType.NONE)
 public class ContainerConfig implements Serializable {
     private static final long serialVersionUID = 2L;
 @XmlAccessorType(XmlAccessType.NONE)
 public class ContainerConfig implements Serializable {
     private static final long serialVersionUID = 2L;

diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java b/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java
index eecc19f2167b71a77d5c381a99bb365dd6b28ed7..582c0766dd35360c6517460ba67f0d340970c7ee 100644 (file)
--- a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java
+++ b/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java
@@ -20,10 +20,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 import org.opendaylight.controller.containermanager.ContainerConfig;
 
 
 import org.opendaylight.controller.containermanager.ContainerConfig;
 
 

-@XmlRootElement(name = "container-config-list")
+@XmlRootElement(name = "containerConfig-list")

 @XmlAccessorType(XmlAccessType.NONE)
 public class ContainerConfigs {
 @XmlAccessorType(XmlAccessType.NONE)
 public class ContainerConfigs {

-        @XmlElement(name = "container-config")
+        @XmlElement(name = "containerConfig")

     List<ContainerConfig> containerConfig;
 
     //To satisfy JAXB
     List<ContainerConfig> containerConfig;
 
     //To satisfy JAXB

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:
      * 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>
      *          <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>
      *           <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>
      *          <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>
      *           <name>udp</name>
      *           <protocol>UDP</protocol>
      *          </flowSpecs>

-     *      </container-config>
-     * </container-config-list>
+     *      </containerConfig>
+     * </containerConfig-list>

      *
      * Response body in JSON:
      *
      * 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"
      *     { "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:
      * 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>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:
      * {
      *
      * Response body in JSON:
      * {

-     *    "container-config": [
+     *    "containerConfig": [

      *       {
      *        "container": "yellow",
      *        "staticVlan": "10",
      *       {
      *        "container": "yellow",
      *        "staticVlan": "10",


@@ -259,11 +259,11 @@ public class ContainerManagerNorthbound {
      * http://localhost:8080/controller/nb/v2/containermanager/container/yellow
      *
      * Request body in XML:
      * 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>yellow</container>
      *       <staticVlan>10</staticVlan>
      *       <nodeConnectors></nodeConnectors>

-     * </container-config>
+     * </containerConfig>

      *
      * Request body in JSON:
      * {
      *
      * Request body in JSON:
      * {