Fix invalid models

These models do not contain correct import stanzas and were resolved
accidentally via prefixes declared in modules thy are importing.

JIRA: YANGTOOLS-889
Change-Id: Ia94e3f78ed4a9aec8b55743b821373738b4e6c54
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv4.yang b/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv4.yang
index 53c9b4f073feaae003542af2b2fe8e7ac3330fb9..eef826e74562b4930099f5e25e576b5a60cef1ee 100644 (file)
--- a/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv4.yang
+++ b/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv4.yang
@@ -7,6 +7,7 @@ module bgp-mvpn-ipv4 {
     import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
     import bgp-message { prefix bgp-msg; revision-date 2018-03-29; }
+    import bgp-multiprotocol { prefix bgp-mp; revision-date 2018-03-29; }
 
     revision 2018-04-17 {
         description "Initial version";
@@ -82,4 +83,4 @@ module bgp-mvpn-ipv4 {
             uses mvpn-routes-ipv4;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv6.yang b/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv6.yang
index 6a5b69374cc024fda69d881d89963068ce7288cf..b78c21e6dffbd9f0e6f705766a60187a9daf22cd 100644 (file)
--- a/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv6.yang
+++ b/bgp/extensions/mvpn/src/main/yang/bgp-mvpn-ipv6.yang
@@ -7,6 +7,7 @@ module bgp-mvpn-ipv6 {
     import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
     import bgp-message { prefix bgp-msg; revision-date 2018-03-29; }
+    import bgp-multiprotocol { prefix bgp-mp; revision-date 2018-03-29; }
 
     revision 2018-04-17 {
         description "Initial version";
@@ -82,4 +83,4 @@ module bgp-mvpn-ipv6 {
             uses mvpn-routes-ipv6;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang b/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang
index de5c52ac22f8a20e938d4eca6c9f7bbf56ea3274..261c8145c62dd07b7965b29ba11f42dace65385f 100644 (file)
--- a/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang
+++ b/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang
@@ -5,6 +5,7 @@ module pmsi-tunnel {
     prefix "pmsi-tunnel";
 
     import bgp-types { prefix bgp-t; revision-date 2018-03-29; }
+    import bgp-message { prefix bgp-msg; revision-date 2018-03-29; }
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import network-concepts { prefix netc; revision-date 2013-11-25; }
     import ietf-yang-types { prefix yang; }

diff --git a/bgp/extensions/route-target/src/main/yang/bgp-route-target-constrain.yang b/bgp/extensions/route-target/src/main/yang/bgp-route-target-constrain.yang
index c582b56210e11fea235eb2185dac9ccf8686ab6f..7371adf3848b7e61f52030db7541a79684bca276 100644 (file)
--- a/bgp/extensions/route-target/src/main/yang/bgp-route-target-constrain.yang
+++ b/bgp/extensions/route-target/src/main/yang/bgp-route-target-constrain.yang
@@ -4,6 +4,7 @@ module bgp-route-target-constrain {
     prefix "bgp-route-target";
 
     import bgp-types { prefix bgp-t; revision-date 2018-03-29; }
+    import bgp-multiprotocol { prefix bgp-mp; revision-date 2018-03-29; }
     import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
     import bgp-message { prefix bgp-msg; revision-date 2018-03-29; }
@@ -148,4 +149,4 @@ module bgp-route-target-constrain {
         description "action to use attribute from advertized from a client(rfc4684)";
         }
     }
-}
\ No newline at end of file
+}

diff --git a/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang b/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang
index 5bb7ff10cc520719ed920b466f0f3f0f070c1057..8735bc11d22c63842a415b8126bbb10b99e783ed 100644 (file)
--- a/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang
+++ b/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang
@@ -6,6 +6,7 @@ module odl-bgp-policy {
     import yang-ext { prefix ext; revision-date 2013-07-09; }
     import openconfig-network-instance { prefix netinst; }
     import openconfig-bgp { prefix openconfig-bgp; }
+    import openconfig-bgp-types { prefix oc-bgp-t; }
     import bgp-rib { prefix rib; revision-date 2018-03-29; }
     import openconfig-routing-policy { prefix rpol; }
     import openconfig-bgp-policy { prefix bgppol; }
@@ -233,7 +234,7 @@ module odl-bgp-policy {
         ext:augment-identifier match-afi-safi-not-in-condition;
         leaf-list afi-safi-not-in {
             type identityref {
-              base "bgp-types:afi-safi-type";
+              base "oc-bgp-t:afi-safi-type";
             }
             description
               "List of address families which the NLRI must not be within";
@@ -309,4 +310,4 @@ module odl-bgp-policy {
             }
         }
     }
-}
\ No newline at end of file
+}