vita: fix bugs in schema

eugeneia · Jan 25, 2019 · 1da3b4f · 1da3b4f
1 parent e5247e0
commit 1da3b4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/program/vita/vita-esp-gateway.yang b/src/program/vita/vita-esp-gateway.yang
@@ -29,18 +29,17 @@ module vita-esp-gateway {
      leaf preshared-key { type key32; mandatory true; }
   }
 
-  choice router {
-    case v4-over-v4 {
-      container private-interface4 { uses interface4; }
+  container private-interface4 { uses interface4; }
+  choice public-router {
+    case over-v4 {
       container public-interface4 { uses interface4; }
       list route4 {
         key id; unique "net-cidr4"; unique "preshared-key"; unique "spi"; uses route;
         leaf net-cidr4 { type inet:ipv4-prefix; mandatory true; }
         leaf gw-ip4 { type inet:ipv4-address-no-zone; }
       }
     }
-    case v4-over-v6 {
-      container private-interface4 { uses interface4; }
+    case over-v6 {
       container public-interface6 { uses interface6; }
       list route46 {
         key id; unique "net-cidr4"; unique "preshared-key"; unique "spi"; uses route;

diff --git a/src/program/vita/vita-gentest.yang b/src/program/vita/vita-gentest.yang
@@ -4,15 +4,10 @@ module vita-gentest {
 
   import vita-esp-gateway { prefix vita; }
 
-  choice router {
-    case v4-over-v4 {
-      container private-interface4 { uses vita:interface4; }
-      container public-interface4 { uses vita:interface4; }
-    }
-    case v4-over-v6 {
-      container private-interface4 { uses vita:interface4; }
-      container public-interface6 { uses vita:interface6; }
-    }
+  container private-interface4 { uses vita:interface4; }
+  choice public-router {
+    container public-interface4 { uses vita:interface4; }
+    container public-interface6 { uses vita:interface6; }
   }
 
   leaf negotiation-ttl { type vita:time-to-live; }