Updated certain yang models to make enterprise and other fields manda…

…tory (#670)
onosproject · Jul 9, 2021 · 8d470a2 · 8d470a2
1 parent 452b608
commit 8d470a2
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 27 deletions.
diff --git a/config-models/aether-3.x/Chart.yaml b/config-models/aether-3.x/Chart.yaml
@@ -4,7 +4,7 @@
 
 apiVersion: v2
 name: config-model-aether
-version: 3.0.5
+version: 3.0.6
 kubeVersion: ">=1.18.0"
 appVersion: 3.0.0
 description: Aether config model

diff --git a/config-models/aether-3.x/files/aether-3.0.0.tree b/config-models/aether-3.x/files/aether-3.0.0.tree
@@ -8,7 +8,7 @@ module: ap-list
         |  +--rw enable?    boolean
         +--rw display-name?    string
         +--rw description?     string
-        +--rw enterprise?      -> /ent:enterprise/enterprise/id
+        +--rw enterprise       -> /ent:enterprise/enterprise/id
 
 module: application
   +--rw application
@@ -22,7 +22,7 @@ module: application
         |  +--rw port-start    uint32
         |  +--rw port-end?     uint32
         |  +--rw protocol?     at:protocol
-        +--rw enterprise?     -> /ent:enterprise/enterprise/id
+        +--rw enterprise      -> /ent:enterprise/enterprise/id
 
 module: connectivity-service
   +--rw connectivity-service
@@ -45,7 +45,7 @@ module: device-group
         |  +--rw imsi-range-from?   uint64
         |  +--rw imsi-range-to?     uint64
         +--rw ip-domain?      -> /ipd:ip-domain/ip-domain/id
-        +--rw site?           -> /st:site/site/id
+        +--rw site            -> /st:site/site/id
 
 module: enterprise
   +--rw enterprise
@@ -68,7 +68,7 @@ module: ip-domain
         +--rw admin-status?    at:admin-status
         +--rw mtu?             at:mtu
         +--rw description?     string
-        +--rw enterprise?      -> /ent:enterprise/enterprise/id
+        +--rw enterprise       -> /ent:enterprise/enterprise/id
 
 module: network
   +--rw network
@@ -78,7 +78,7 @@ module: network
         +--rw mcc             at:mcc
         +--rw mnc             at:mnc
         +--rw description?    string
-        +--rw enterprise?     -> /ent:enterprise/enterprise/id
+        +--rw enterprise      -> /ent:enterprise/enterprise/id
 
 module: site
   +--rw site
@@ -87,7 +87,7 @@ module: site
         +--rw display-name?   string
         +--rw enterprise?     -> /ent:enterprise/enterprise/id
         +--rw network?        -> /net:network/network/id
-        +--rw description?    string
+        +--rw description     string
 
 module: template
   +--rw template
@@ -119,7 +119,7 @@ module: upf
         +--rw port            uint32
         +--rw display-name?   string
         +--rw description?    string
-        +--rw enterprise?     -> /ent:enterprise/enterprise/id
+        +--rw enterprise      -> /ent:enterprise/enterprise/id
 
 module: vcs
   +--rw vcs

diff --git a/config-models/aether-3.x/files/yang/aether-types.yang b/config-models/aether-3.x/files/yang/aether-types.yang
@@ -84,7 +84,7 @@ module aether-types {
   typedef mtu {
       // TODO: Aether-roc-api fails on uint16. AETHER-1859.
       type uint32 {
-        range 0..65535;
+        range 68..65535;
       }
       default 1492;
   }

diff --git a/config-models/aether-3.x/files/yang/ap-list.yang b/config-models/aether-3.x/files/yang/ap-list.yang
@@ -5,6 +5,7 @@ module ap-list {
   import ietf-inet-types { prefix inet; }
   import aether-types { prefix at; }
   import enterprise{ prefix ent; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -17,7 +18,7 @@ module ap-list {
   }
 
   typedef ap-list-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }
@@ -78,7 +79,8 @@ module ap-list {
       leaf enterprise {
         type leafref {
           path "/ent:enterprise/ent:enterprise/ent:id";
-        }              
+        }
+        mandatory true;
         description
           "Link to enterprise that owns this Access Point List";
       }       

diff --git a/config-models/aether-3.x/files/yang/application.yang b/config-models/aether-3.x/files/yang/application.yang
@@ -5,6 +5,7 @@ module application {
   import ietf-inet-types{ prefix ietf; }
   import aether-types{ prefix at; }
   import enterprise{ prefix ent; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -19,7 +20,7 @@ module application {
   }
 
   typedef application-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }
@@ -90,7 +91,8 @@ module application {
       leaf enterprise {
         type leafref {
           path "/ent:enterprise/ent:enterprise/ent:id";
-        }              
+        }
+        mandatory true;
         description
           "Link to enterprise that owns this Application. May be set to None if the application is global to all Enterprises.";
       }

diff --git a/config-models/aether-3.x/files/yang/connectivity-service.yang b/config-models/aether-3.x/files/yang/connectivity-service.yang
@@ -3,6 +3,7 @@ module connectivity-service {
   prefix cs;
 
   import ietf-inet-types { prefix inet; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -16,7 +17,7 @@ module connectivity-service {
   }
 
   typedef connectivity-service-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }

diff --git a/config-models/aether-3.x/files/yang/device-group.yang b/config-models/aether-3.x/files/yang/device-group.yang
@@ -4,6 +4,7 @@ module device-group {
 
   import ip-domain{ prefix ipd; }
   import site{ prefix st; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -24,7 +25,7 @@ module device-group {
   }
 
   typedef device-group-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }  
@@ -78,7 +79,8 @@ module device-group {
       leaf site {
         type leafref {
           path "/st:site/st:site/st:id";
-        }          
+        }
+        mandatory true;
         description
           "Link to site";
       }        

diff --git a/config-models/aether-3.x/files/yang/enterprise.yang b/config-models/aether-3.x/files/yang/enterprise.yang
@@ -3,6 +3,7 @@ module enterprise {
   prefix ent;
 
   import connectivity-service { prefix cs; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -16,7 +17,7 @@ module enterprise {
   }
 
   typedef enterprise-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }

diff --git a/config-models/aether-3.x/files/yang/ip-domain.yang b/config-models/aether-3.x/files/yang/ip-domain.yang
@@ -5,6 +5,7 @@ module ip-domain {
   import ietf-inet-types { prefix inet; }
   import aether-types { prefix at; }
   import enterprise{ prefix ent; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -19,7 +20,7 @@ module ip-domain {
   }
 
   typedef ip-domain-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }
@@ -84,7 +85,8 @@ module ip-domain {
       leaf enterprise {
         type leafref {
           path "/ent:enterprise/ent:enterprise/ent:id";
-        }              
+        }
+        mandatory true;
         description
           "Link to enterprise that owns this Access Point List";
       }         

diff --git a/config-models/aether-3.x/files/yang/network.yang b/config-models/aether-3.x/files/yang/network.yang
@@ -4,6 +4,7 @@ module network {
 
   import aether-types{ prefix at; }
   import enterprise{ prefix ent; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -17,7 +18,7 @@ module network {
   }
 
   typedef network-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }
@@ -65,7 +66,8 @@ module network {
       leaf enterprise {
         type leafref {
           path "/ent:enterprise/ent:enterprise/ent:id";
-        }              
+        }
+        mandatory true;
         description
           "Link to enterprise that owns this Network. If this is set to None, then the Network is globally provided by Aether.";
       }      

diff --git a/config-models/aether-3.x/files/yang/site.yang b/config-models/aether-3.x/files/yang/site.yang
@@ -4,6 +4,7 @@ module site {
 
   import enterprise{ prefix ent; }
   import network{ prefix net; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -16,7 +17,7 @@ module site {
   }
 
   typedef site-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }
@@ -61,6 +62,7 @@ module site {
         type string {
           length 1..100;
         }
+        mandatory true;
         description "description of this site";
       }         
     }

diff --git a/config-models/aether-3.x/files/yang/template.yang b/config-models/aether-3.x/files/yang/template.yang
@@ -4,6 +4,7 @@ module template {
 
   import aether-types{ prefix at; }
   import traffic-class{ prefix tc; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -18,7 +19,7 @@ module template {
   }
 
   typedef template-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }

diff --git a/config-models/aether-3.x/files/yang/traffic-class.yang b/config-models/aether-3.x/files/yang/traffic-class.yang
@@ -3,6 +3,7 @@ module traffic-class {
   prefix tp;
 
   import aether-types{ prefix at; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -16,7 +17,7 @@ module traffic-class {
   }
 
   typedef traffic-class-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }

diff --git a/config-models/aether-3.x/files/yang/upf.yang b/config-models/aether-3.x/files/yang/upf.yang
@@ -4,6 +4,7 @@ module upf {
 
   import ietf-inet-types { prefix inet; }
   import enterprise{ prefix ent; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -15,7 +16,7 @@ module upf {
   }
 
   typedef upf-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }
@@ -69,7 +70,8 @@ module upf {
       leaf enterprise {
         type leafref {
           path "/ent:enterprise/ent:enterprise/ent:id";
-        }              
+        }
+        mandatory true;
         description
           "Link to enterprise that owns this Access Point List";
       }      

diff --git a/config-models/aether-3.x/files/yang/vcs.yang b/config-models/aether-3.x/files/yang/vcs.yang
@@ -9,6 +9,7 @@ module vcs {
   import aether-types{ prefix at; }
   import device-group{ prefix dg; }
   import traffic-class{ prefix tc; }
+  import ietf-yang-types{ prefix yg; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -22,7 +23,7 @@ module vcs {
   }
 
   typedef vcs-id {
-        type string {
+        type yg:yang-identifier {
             length 1..32;
         }
   }
@@ -82,6 +83,7 @@ module vcs {
           type leafref {
             path "/app:application/app:application/app:id";
           }
+          mandatory true;
           description
             "Link to application";
         }