Rename modfied ietf-routing models

Change-Id: I6ea55212dcf3cc6e4015269b501ffd7828096459
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/routing/routing-api/src/main/yang/ietf-ipv4-unicast-routing.yang b/routing/routing-api/src/main/yang/[email protected]
similarity index 99%
rename from routing/routing-api/src/main/yang/ietf-ipv4-unicast-routing.yang
rename to routing/routing-api/src/main/yang/[email protected]
index 49052c1..8db4237 100644 (file)
--- a/routing/routing-api/src/main/yang/ietf-ipv4-unicast-routing.yang
+++ b/routing/routing-api/src/main/yang/[email protected]
@@ -1,11 +1,12 @@
-module ietf-ipv4-unicast-routing {
+module hc2vpp-ietf-ipv4-unicast-routing {
 
   namespace "urn:ietf:params:xml:ns:yang:ietf-ipv4-unicast-routing";
 
   prefix "v4ur";
 
-  import ietf-routing {
+  import hc2vpp-ietf-routing {
     prefix "rt";
+    revision-date 2014-05-24;
   }
 
   import ietf-inet-types {

diff --git a/routing/routing-api/src/main/yang/ietf-ipv6-unicast-routing.yang b/routing/routing-api/src/main/yang/[email protected]
similarity index 99%
rename from routing/routing-api/src/main/yang/ietf-ipv6-unicast-routing.yang
rename to routing/routing-api/src/main/yang/[email protected]
index 9c6ce4d..72c54f2 100644 (file)
--- a/routing/routing-api/src/main/yang/ietf-ipv6-unicast-routing.yang
+++ b/routing/routing-api/src/main/yang/[email protected]
@@ -1,11 +1,12 @@
-module ietf-ipv6-unicast-routing {
+module hc2vpp-ietf-ipv6-unicast-routing {
 
   namespace "urn:ietf:params:xml:ns:yang:ietf-ipv6-unicast-routing";
 
   prefix "v6ur";
 
-  import ietf-routing {
+  import hc2vpp-ietf-routing {
     prefix "rt";
+    revision-date 2014-05-24;
   }
 
   import ietf-inet-types {

diff --git a/routing/routing-api/src/main/yang/ietf-routing.yang b/routing/routing-api/src/main/yang/[email protected]
similarity index 99%
rename from routing/routing-api/src/main/yang/ietf-routing.yang
rename to routing/routing-api/src/main/yang/[email protected]
index 6902cd0..118225c 100644 (file)
--- a/routing/routing-api/src/main/yang/ietf-routing.yang
+++ b/routing/routing-api/src/main/yang/[email protected]
@@ -1,4 +1,4 @@
-module ietf-routing{
+module hc2vpp-ietf-routing {
 
   namespace "urn:ietf:params:xml:ns:yang:ietf-routing";
 

diff --git a/routing/routing-api/src/main/yang/vpp-routing.yang b/routing/routing-api/src/main/yang/vpp-routing.yang
index 49884ad..5acda39 100644 (file)
--- a/routing/routing-api/src/main/yang/vpp-routing.yang
+++ b/routing/routing-api/src/main/yang/vpp-routing.yang
@@ -15,8 +15,8 @@ module vpp-routing{
     import vpp-classifier {
         prefix "classifier";
     }
-    
-    import ietf-routing {
+
+    import hc2vpp-ietf-routing {
         prefix "ietf-r";
     }
 

diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
index a13364d..2194dfb 100644 (file)
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
@@ -41,11 +41,11 @@ public interface RoutingRequestTestHelper extends ByteDataTranslator, FutureProd
     String ROUTE_PROTOCOL_NAME = "tst-protocol";
     String ROUTE_PROTOCOL_NAME_2 = "tst-protocol-2";
     String ROUTE_NAME = "tst-route";
-    String STATIC_ROUTE_PATH = "/ietf-routing:routing" +
-            "/ietf-routing:routing-instance[ietf-routing:name='" + ROUTE_PROTOCOL_NAME + "']" +
-            "/ietf-routing:routing-protocols" +
-            "/ietf-routing:routing-protocol[ietf-routing:name='" + ROUTE_NAME + "']" +
-            "/ietf-routing:static-routes";
+    String STATIC_ROUTE_PATH = "/hc2vpp-ietf-routing:routing" +
+            "/hc2vpp-ietf-routing:routing-instance[hc2vpp-ietf-routing:name='" + ROUTE_PROTOCOL_NAME + "']" +
+            "/hc2vpp-ietf-routing:routing-protocols" +
+            "/hc2vpp-ietf-routing:routing-protocol[hc2vpp-ietf-routing:name='" + ROUTE_NAME + "']" +
+            "/hc2vpp-ietf-routing:static-routes";
 
     default IpAddDelRoute desiredFlaglessResult(final int add, final int ipv6, final int isMultipath,
                                                 final byte[] destinationAddress,

diff --git a/routing/routing_postman_collection.json b/routing/routing_postman_collection.json
index a3c529d..2838dae 100644 (file)
--- a/routing/routing_postman_collection.json
+++ b/routing/routing_postman_collection.json
@@ -23,7 +23,7 @@
                {
                        "id": "260fce67-2d84-8557-ff03-b4371fc62cdb",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/config/ietf-routing:routing",
+                       "url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "GET",
@@ -43,7 +43,7 @@
                {
                        "id": "2bf3def8-ef34-fa83-0789-ecebb03f297f",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/config/ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-2",
+                       "url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-2",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "PUT",
@@ -63,7 +63,7 @@
                {
                        "id": "41585a9d-5067-05d8-2dc1-3ace153a70b6",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/config/ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-5",
+                       "url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-5",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "PUT",
@@ -83,7 +83,7 @@
                {
                        "id": "6244bd7f-dedd-bd6d-45c3-00b0fd10bb21",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/config/ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-6",
+                       "url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-6",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "PUT",
@@ -103,7 +103,7 @@
                {
                        "id": "86b915a1-f85c-939a-0814-fd98b1154162",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/config/ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-4",
+                       "url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-4",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "PUT",
@@ -123,7 +123,7 @@
                {
                        "id": "c50cc4a4-a760-f91a-fe66-dd8a66d6085b",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/operational/ietf-routing:routing-state",
+                       "url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing-state",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "GET",
@@ -162,7 +162,7 @@
                {
                        "id": "de73785a-6784-b280-a9bc-6d6e48199f09",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/operational/ietf-routing:routing-state/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/vpp-routing-protocol_2",
+                       "url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing-state/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/vpp-routing-protocol_2",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "GET",
@@ -182,7 +182,7 @@
                {
                        "id": "e3510e60-17e7-887b-6a55-5e0f651512b0",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/config/ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-1",
+                       "url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-1",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "PUT",
@@ -221,7 +221,7 @@
                {
                        "id": "ea4e8b3d-2333-6c17-1da2-32fd0b88da96",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://localhost:8183/restconf/config/ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-3",
+                       "url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-3",
                        "preRequestScript": null,
                        "pathVariables": {},
                        "method": "PUT",