Change-Id: Iaa9e7cf3d67363197b09440d52b887df8fd28f51
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
* 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;
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
* 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>
*        <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>
*        <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"
* 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": [
* {
* "container": "yellow",
* "staticVlan": "10",
* {
* "container": "yellow",
* "staticVlan": "10",
* 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:
* {