From: Tomás Villaseca <tvillaseca@whitestack.com>
Date: Sat, 16 May 2020 21:27:50 +0000 (-0400)
Subject: Fix colliding namespaces and unused imports
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b6c0016b6ccce9647d237d67b6dedd148196e69f;p=osm%2FIM.git

Fix colliding namespaces and unused imports

Change-Id: I6298f8992a4bba6040a24662e69631b7127d1040
Signed-off-by: Tomás Villaseca <tvillaseca@whitestack.com>
---

diff --git a/augments/vnfd/cloud-init.yang b/augments/vnfd/cloud-init.yang
index 73bc723..160c5c8 100644
--- a/augments/vnfd/cloud-init.yang
+++ b/augments/vnfd/cloud-init.yang
@@ -17,7 +17,7 @@
 
 module cloud-init {
     yang-version 1.1;
-    namespace "urn:etsi:osm:yang:augments";
+    namespace "urn:etsi:osm:yang:augments:cloud-init";
     prefix "cloud-init";
 
     import etsi-nfv-vnfd {
diff --git a/augments/vnfd/day1-2.yang b/augments/vnfd/day1-2.yang
index ccdc49a..e66ce16 100644
--- a/augments/vnfd/day1-2.yang
+++ b/augments/vnfd/day1-2.yang
@@ -17,7 +17,7 @@
 
 module day1-2 {
     yang-version 1.1;
-    namespace "urn:etsi:osm:yang:augments";
+    namespace "urn:etsi:osm:yang:augments:day1-2";
     prefix "day1-2";
 
     import etsi-nfv-vnfd {
diff --git a/augments/vnfd/mgmt-interface.yang b/augments/vnfd/mgmt-interface.yang
index d9cf686..b4353d0 100644
--- a/augments/vnfd/mgmt-interface.yang
+++ b/augments/vnfd/mgmt-interface.yang
@@ -24,9 +24,6 @@ module mgmt-interface {
         prefix vnfd;
     }
 
-    import ietf-inet-types {
-        prefix "inet";
-    }
     grouping extended-mgmt-interface {
         leaf mgmt-cp {
             description
diff --git a/augments/vnfd/various.yang b/augments/vnfd/various.yang
index e1981a0..23f86ca 100644
--- a/augments/vnfd/various.yang
+++ b/augments/vnfd/various.yang
@@ -23,11 +23,7 @@ module various {
     import etsi-nfv-vnfd {
         prefix vnfd;
     }
-
-    import common-augments {
-        prefix common;
-    }
-
+    
     grouping extended-vld {
         container provider-network {
             description