BUG-108: remove useless prefixes

Change-Id: Iecfd0744120819896891b2e22dc808a802163583
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/linkstate/src/main/yang/bgp-linkstate.yang b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
index 771b285619516b33554cbb68415127fe7e6c78b8..89a85ac2b8af19eecb463e8ba27e10a42c3c86f6 100644 (file)
--- a/bgp/linkstate/src/main/yang/bgp-linkstate.yang
+++ b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
@@ -547,54 +547,54 @@ module bgp-linkstate {
                case linkstate-routes {
                        container linkstate-routes {
                                leaf distinguisher {
-                                       type bgp-ls:route-distinguisher;
+                                       type route-distinguisher;
                                }
                                leaf protocol-id {
-                                       type bgp-ls:protocol-id;
+                                       type protocol-id;
                                }
                                leaf identifier {
-                                       type bgp-ls:identifier;
+                                       type identifier;
                                }
 
                                choice object-type {
                                        case node {
                                                container node-descriptors {
-                                                       uses bgp-ls:node-identifier;
+                                                       uses node-identifier;
                                                }
                                        }
                                        case link {
                                                container local-node-descriptors {
-                                                       uses bgp-ls:node-identifier;
+                                                       uses node-identifier;
                                                }
                                                container remote-node-descriptors {
-                                                       uses bgp-ls:node-identifier;
+                                                       uses node-identifier;
                                                }
                                                container link-descriptors {
-                                                       uses bgp-ls:link-identifiers;
+                                                       uses link-identifiers;
                                                        leaf ipv4-interface-address {
-                                                               type bgp-ls:ipv4-interface-identifier;
+                                                               type ipv4-interface-identifier;
                                                        }
                                                        leaf ipv6-interface-address {
-                                                               type bgp-ls:ipv6-interface-identifier;
+                                                               type ipv6-interface-identifier;
                                                        }
                                                        leaf ipv4-neighbor-address {
-                                                               type bgp-ls:ipv4-interface-identifier;
+                                                               type ipv4-interface-identifier;
                                                        }
                                                        leaf ipv6-neighbor-address {
-                                                               type bgp-ls:ipv6-interface-identifier;
+                                                               type ipv6-interface-identifier;
                                                        }
                                                        leaf multi-topology-id {
-                                                               type bgp-ls:topology-identifier;
+                                                               type topology-identifier;
                                                        }
                                                }
                                        }
                                        case prefix {
                                                leaf multi-topology-id {
-                                                       type bgp-ls:topology-identifier;
+                                                       type topology-identifier;
                                                }
                                                leaf ospf-route-type {
                                                        when "../../protocol-id = 'ospf'";
-                                                       type bgp-ls:ospf-route-type;
+                                                       type ospf-route-type;
                                                }
                                                leaf ip-reachability-information {
                                                        type inet:ip-prefix;