Regenerate YANG XMLs used for dynamic Sfc-UI generation

Change-Id: I36bc5c2eead9128160ef2f1deb9e6641e7d402dd
Signed-off-by: Andrej Kincel <[email protected]>

diff --git a/sfc-ui/src/main/resources/pages/assets/data/locale-en_US.json b/sfc-ui/src/main/resources/pages/assets/data/locale-en_US.json
index 5391ff809847a10424193533a11e81063c1f9ebc..70dbce9f0b44fa785f1386108670c4cf58066db3 100755 (executable)
--- a/sfc-ui/src/main/resources/pages/assets/data/locale-en_US.json
+++ b/sfc-ui/src/main/resources/pages/assets/data/locale-en_US.json
@@ -633,6 +633,7 @@
   "SFC_PLACEHOLDER_yang:mac-address": "Example: 00:0A:95:9D:68:16",\r
   "SFC_PLACEHOLDER_inet:ip-address": "Example: 10.0.0.1",\r
   "SFC_PLACEHOLDER_inet:port-number": "Number in range 0-65535",\r
+  "SFC_PLACEHOLDER_uint32": "Type in a number",\r
 \r
   "JSON_LAST_PROPERTY": "Stabile last property of this JSON, for nice merging"\r
 }\r

diff --git a/sfc-ui/src/main/resources/pages/assets/yang2xml/ietf-acl.yang.xml b/sfc-ui/src/main/resources/pages/assets/yang2xml/ietf-acl.yang.xml
index f2137bf859df6d2432a90172b78f7b9bf3d68085..7c9a52b35fe476903ec90c7740210401bd767729 100644 (file)
--- a/sfc-ui/src/main/resources/pages/assets/yang2xml/ietf-acl.yang.xml
+++ b/sfc-ui/src/main/resources/pages/assets/yang2xml/ietf-acl.yang.xml
@@ -146,4 +146,35 @@ for each kind and for each vendor.
       </container>
     </list>
   </container>
+  <container name="access-lists-state">
+    <description>
+      <text>This container hold operational state for all access lists</text>
+    </description>
+    <config value="false"/>
+    <list name="access-list-state">
+      <description>
+        <text>This list holds operational data for all access lists
+in the domain</text>
+      </description>
+      <key value="acl-name"/>
+      <leaf name="acl-name">
+        <type name="string"/>
+        <description>
+          <text>The name of the acl</text>
+        </description>
+      </leaf>
+      <list name="acl-service-function-classifier">
+        <key value="name"/>
+        <leaf name="name">
+          <type name="string"/>
+          <description>
+            <text>The name of the classifier</text>
+          </description>
+        </leaf>
+        <description>
+          <text>A list of all classifiers that use rules from this access list</text>
+        </description>
+      </list>
+    </list>
+  </container>
 </module>

diff --git a/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-description-monitor.yang.xml b/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-description-monitor.yang.xml
index be80094e1b6f61aac42700571f6fe5d179e40f7b..5af71e774db0928e0a4f972773068a2037cea8c4 100644 (file)
--- a/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-description-monitor.yang.xml
+++ b/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-description-monitor.yang.xml
@@ -24,7 +24,7 @@
       <text>Initial revision.</text>
     </description>
   </revision>
-  <augment target-node="/sfc-sf:service-functions/sfc-sf:service-function">
+  <augment target-node="/sfc-sf:service-functions-state/sfc-sf:service-function-state">
     <description>
       <text>Service function description and monitoring information</text>
     </description>

diff --git a/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-type.yang.xml b/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-type.yang.xml
index d1b9af38d15ba2d1ee400804221d56915e766488..7a988636678dff95bcbe5c406bf99b89cb01de2c 100644 (file)
--- a/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-type.yang.xml
+++ b/sfc-ui/src/main/resources/pages/assets/yang2xml/service-function-type.yang.xml
@@ -79,6 +79,12 @@ types are derived.</text>
       <text>Intrusion Detection System</text>
     </description>
   </identity>
+  <identity name="http-header-enrichment">
+    <base name="service-function-type-identity"/>
+    <description>
+      <text>HTTP services that add HTTP headers for charging and adding subscriber metadata</text>
+    </description>
+  </identity>
   <typedef name="service-function-type">
     <type name="identityref">
       <base name="service-function-type-identity"/>

diff --git a/sfc-ui/src/main/resources/pages/assets/yang2xml/service-locator.yang.xml b/sfc-ui/src/main/resources/pages/assets/yang2xml/service-locator.yang.xml
index 089d77c4b5d00e64666daba2fa9346c2396f14b5..4b5620250cb11bbab1ae30ee63d55093dcc679bd 100644 (file)
--- a/sfc-ui/src/main/resources/pages/assets/yang2xml/service-locator.yang.xml
+++ b/sfc-ui/src/main/resources/pages/assets/yang2xml/service-locator.yang.xml
@@ -63,6 +63,12 @@ derived.</text>
       <text>GRE transport type</text>
     </description>
   </identity>
+  <identity name="mpls">
+    <base name="sl-transport-type"/>
+    <description>
+      <text>Multi Protocol Label Switching transport type</text>
+    </description>
+  </identity>
   <identity name="other">
     <base name="sl-transport-type"/>
     <description>
@@ -123,6 +129,19 @@ types</text>
       </description>
     </leaf>
   </grouping>
+  <grouping name="mpls-locator">
+    <description>
+      <text>Data plane-locator: MPLS</text>
+    </description>
+    <leaf name="mpls-label">
+      <type name="uint32">
+        <range value="1..1048575"/>
+      </type>
+      <description>
+        <text>MPLS Label, 20 bits</text>
+      </description>
+    </leaf>
+  </grouping>
   <grouping name="function-locator">
     <description>
       <text>When SF is co-located with SFF, this could be the name of a
@@ -154,6 +173,9 @@ information for service function elements in the domain</text>
       <case name="function">
         <uses name="function-locator"/>
       </case>
+      <case name="mpls">
+        <uses name="mpls-locator"/>
+      </case>
       <description>
         <text>The collection of all possible data-plane
 locators. Only one can be chosen</text>