Set presence statement to config and status containers.

Config and status containers should be visible even if empty.

Change-Id: If926d745c9e732ff4fb1d5646cc105aec4f30a93
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>

diff --git a/manager/model/src/main/yang/vtn-config.yang b/manager/model/src/main/yang/vtn-config.yang
index b58294f24e1bbefcdfdd2493388090980349ac60..cc39261ebda5c6030a8a69d5d8863c314572c3db 100644 (file)
--- a/manager/model/src/main/yang/vtn-config.yang
+++ b/manager/model/src/main/yang/vtn-config.yang
@@ -12,7 +12,7 @@ module vtn-config {
     namespace "urn:opendaylight:vtn:config";
     prefix vconf;
 
-    /* OpenDaylight yangtools */
+    /* OpenDaylight MD-SAL */
     import ietf-yang-types {
         prefix yang;
         revision-date 2010-09-24;

diff --git a/manager/model/src/main/yang/vtn-flow-action.yang b/manager/model/src/main/yang/vtn-flow-action.yang
index 74b382cb657818aad5a72ce816e01a76b86c29f5..0eb35d62d58d5060acb57ab1d75ab2e71fab1250 100644 (file)
--- a/manager/model/src/main/yang/vtn-flow-action.yang
+++ b/manager/model/src/main/yang/vtn-flow-action.yang
@@ -17,7 +17,7 @@ module vtn-flow-action {
         revision-date 2015-02-09;
     }
 
-    /* OpenDaylight yangtools */
+    /* OpenDaylight MD-SAL */
     import opendaylight-l2-types {
         prefix l2;
         revision-date 2013-08-27;

diff --git a/manager/model/src/main/yang/vtn-flow-condition.yang b/manager/model/src/main/yang/vtn-flow-condition.yang
index b5e04dc2fe6214a6ec319f878ee709651bb490bc..e74672db54414166312bbb81d8fa4688897a1067 100644 (file)
--- a/manager/model/src/main/yang/vtn-flow-condition.yang
+++ b/manager/model/src/main/yang/vtn-flow-condition.yang
@@ -17,7 +17,7 @@ module vtn-flow-condition {
         revision-date 2015-02-09;
     }
 
-    /* OpenDaylight yangtools */
+    /* OpenDaylight MD-SAL */
     import opendaylight-l2-types {
         prefix l2;
         revision-date 2013-08-27;

diff --git a/manager/model/src/main/yang/vtn-mac-map.yang b/manager/model/src/main/yang/vtn-mac-map.yang
index a5e93cde0990a8a8c82ae773800d6fcef58daaf3..bb57e2c50d0fdd2b7ed084edaa93a5ac841eb287 100644 (file)
--- a/manager/model/src/main/yang/vtn-mac-map.yang
+++ b/manager/model/src/main/yang/vtn-mac-map.yang
@@ -20,7 +20,7 @@ module vtn-mac-map {
         revision-date 2015-09-07;
     }
 
-    /* OpenDaylight yangtools */
+    /* OpenDaylight MD-SAL */
     import ietf-yang-types {
         prefix yang;
         revision-date 2010-09-24;
@@ -96,6 +96,7 @@ module vtn-mac-map {
         container mac-map-config {
             description
               "The container which contains configuration for MAC mapping.";
+            presence "Indicates that the MAC mapping is present.";
             uses vtn-mac-map-config;
         }
 
@@ -103,6 +104,7 @@ module vtn-mac-map {
             description
               "The container which contains runtime status information about
                MAC mapping.";
+            presence "Indicates that the MAC mapping is present.";
             uses vtn-mac-map-status;
         }
     }

diff --git a/manager/model/src/main/yang/vtn-mac-table.yang b/manager/model/src/main/yang/vtn-mac-table.yang
index 021470749409b4d90c8b3b81e7e0aa57b64a097e..10406e93ca470e867f3d4c99d2bf5c5367ff06cf 100644 (file)
--- a/manager/model/src/main/yang/vtn-mac-table.yang
+++ b/manager/model/src/main/yang/vtn-mac-table.yang
@@ -22,7 +22,7 @@ module vtn-mac-table {
         revision-date 2013-08-19;
     }
 
-    /* OpenDaylight yangtools */
+    /* OpenDaylight MD-SAL */
     import ietf-yang-types {
         prefix yang;
         revision-date 2010-09-24;

diff --git a/manager/model/src/main/yang/vtn-port-map.yang b/manager/model/src/main/yang/vtn-port-map.yang
index b9697c4edf00d104f3c86919c0ddb14a4f9b4256..d38056968c8b85d31e1cc762b9e47fca6d8662ea 100644 (file)
--- a/manager/model/src/main/yang/vtn-port-map.yang
+++ b/manager/model/src/main/yang/vtn-port-map.yang
@@ -60,6 +60,7 @@ module vtn-port-map {
               "The container which contains port mapping configuration,
                which maps a physical switch port to a virtual interface in
                a virtual node.";
+            presence "Indicates that the port mapping is present.";
             uses vtn-port-map-config;
         }
     }

diff --git a/manager/model/src/main/yang/vtn-types.yang b/manager/model/src/main/yang/vtn-types.yang
index 6dedfc65466dd9140259cd6895879c58bbf13e4d..c03cfef6e846e453f05aea646f27aace430bb27d 100644 (file)
--- a/manager/model/src/main/yang/vtn-types.yang
+++ b/manager/model/src/main/yang/vtn-types.yang
@@ -24,7 +24,7 @@ module vtn-types {
         revision-date 2013-11-12;
     }
 
-    /* OpenDaylight yangtools */
+    /* OpenDaylight MD-SAL */
     import opendaylight-l2-types {
         prefix l2;
         revision-date 2013-08-27;

diff --git a/manager/model/src/main/yang/vtn-vbridge.yang b/manager/model/src/main/yang/vtn-vbridge.yang
index 9efbf8c5cf66c3eb9c3ab67e3a831f479d85346f..a3c646463b7581cd39560186a4a72249ffc17da9 100644 (file)
--- a/manager/model/src/main/yang/vtn-vbridge.yang
+++ b/manager/model/src/main/yang/vtn-vbridge.yang
@@ -113,6 +113,7 @@ module vtn-vbridge {
             description
               "The container which contains runtime information about
                this virtual bridge.";
+            presence "Indicates that the virtual bridge is present.";
             uses vtn-bridge-status;
         }
 
@@ -182,6 +183,7 @@ module vtn-vbridge {
         container vbridge-config {
             description
               "The container which contains configuration for vBridge.";
+            presence "Indicates that the vBridge is present.";
             uses vtn-vbridge-config;
         }
 

diff --git a/manager/model/src/main/yang/vtn-vinterface.yang b/manager/model/src/main/yang/vtn-vinterface.yang
index 9b086da32b7d7105d8ca1b644b07e9afb7259809..a90539adf942f5e1e02566278e9364d3a300fed2 100644 (file)
--- a/manager/model/src/main/yang/vtn-vinterface.yang
+++ b/manager/model/src/main/yang/vtn-vinterface.yang
@@ -77,6 +77,7 @@ module vtn-vinterface {
             description
               "The container which contains configuration for virtual
                interface.";
+            presence "Indicates that the virtual interface is present.";
             uses vtn-vinterface-config;
         }
 
@@ -147,6 +148,7 @@ module vtn-vinterface {
               "The container which contains runtime status information about
                the virtual interface which can contain port mapping
                configuration.";
+            presence "Indicates that the virtual interface is present.";
             uses vtn-mappable-vinterface-status;
         }
 

diff --git a/manager/model/src/main/yang/vtn-vlan-map.yang b/manager/model/src/main/yang/vtn-vlan-map.yang
index bea9aa71116eea153a1fe6d872f226d44e1646bf..9390eab76cd368c64aea94f4b9f60062ed319f33 100644 (file)
--- a/manager/model/src/main/yang/vtn-vlan-map.yang
+++ b/manager/model/src/main/yang/vtn-vlan-map.yang
@@ -78,6 +78,7 @@ module vtn-vlan-map {
         container vlan-map-config {
             description
               "The container which contains configuration for VLAN mapping.";
+            presence "Indicates that the VLAN mapping is present.";
             uses vtn-vlan-map-config;
         }
 
@@ -85,6 +86,7 @@ module vtn-vlan-map {
             description
               "The container which contains runtime status information about
                VLAN mapping.";
+            presence "Indicates that the VLAN mapping is present.";
             uses vtn-vlan-map-status;
         }
     }

diff --git a/manager/model/src/main/yang/vtn-vterminal.yang b/manager/model/src/main/yang/vtn-vterminal.yang
index d72e1a465febe52ea7de4c85dda7d4a5d294c4cf..559aa37ef67aee9b9f9bed6ec2771142401a9e0b 100644 (file)
--- a/manager/model/src/main/yang/vtn-vterminal.yang
+++ b/manager/model/src/main/yang/vtn-vterminal.yang
@@ -72,6 +72,7 @@ module vtn-vterminal {
         container vterminal-config {
             description
               "The container which contains configuration for vTerminal.";
+            presence "Indicates that the VLAN mapping is present.";
             uses vtn-vterminal-config;
         }
 

diff --git a/manager/model/src/main/yang/vtn.yang b/manager/model/src/main/yang/vtn.yang
index 8eec4aa77cefa08eb6e49bd459dcb8566dc66155..67731e9f59589f4af32dcc837eaa324d7d143b05 100644 (file)
--- a/manager/model/src/main/yang/vtn.yang
+++ b/manager/model/src/main/yang/vtn.yang
@@ -70,6 +70,7 @@ module vtn {
             description
               "The container which contains configuration for the Virtual
                Tenant Network (VTN).";
+            presence "Indicates that the VTN is present.";
             uses vtn-vtenant-config;
         }