Use unified namespaces for core/basic/ext modules

urn:opendaylight:alto:core -> urn:alto
urn:opendaylight:alto:basic -> urn:alto
urn:opendaylight:alto:ext -> urn:alto

This approach is to avoid future conflicts when some experimental
features become part of the standard protocol.

This patch also comes with a bash script to help with the migration.

Change-Id: Ia1ee3b9c9c07a1678820c81e46e437ae18b6d72f
Signed-off-by: Kai GAO <gaok12@mails.tsinghua.edu.cn>

diff --git a/alto-basic/auto-maps/api/src/main/yang/alto-auto-maps.yang b/alto-basic/auto-maps/api/src/main/yang/alto-auto-maps.yang
index 072d9b6896b7eee5373dc59cf3a8e025d35a0c6b..0d0baf8763dca379fbb43c555729fe67d2126f16 100644 (file)
--- a/alto-basic/auto-maps/api/src/main/yang/alto-auto-maps.yang
+++ b/alto-basic/auto-maps/api/src/main/yang/alto-auto-maps.yang
@@ -1,6 +1,6 @@
 module alto-auto-maps {
     yang-version 1;
-    namespace "urn:opendaylight:alto:basic:auto:maps";
+    namespace "urn:alto:auto:maps";
     prefix "alto-auto-maps";
 
     revision "2015-01-05" {

diff --git a/alto-basic/auto-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoAutoMapsUpdateListener.java b/alto-basic/auto-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoAutoMapsUpdateListener.java
index 0df1a11e05199239b282c361e9732a0c063a1ce5..75d3cbf21881fcc33b04ba5a77f14a52270467dd 100644 (file)
--- a/alto-basic/auto-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoAutoMapsUpdateListener.java
+++ b/alto-basic/auto-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoAutoMapsUpdateListener.java
@@ -18,10 +18,10 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.address.tracker.rev140617.address.node.connector.Addresses;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.EndpointAddressType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.endpoint.address.group.EndpointAddressGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.endpoint.address.group.EndpointAddressGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.EndpointAddressType;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.endpoint.address.group.EndpointAddressGroup;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.endpoint.address.group.EndpointAddressGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.host.tracker.rev140624.HostNode;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
@@ -124,11 +124,11 @@ public class AltoAutoMapsUpdateListener implements DataChangeListener, AutoClose
     }
 
     private void mergeAddressesListToDefaultNetworkMap(List<Addresses> addressesList, final WriteTransaction wx) {
-        List<org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic
+        List<org.opendaylight.yang.gen.v1.urn.alto
                 .manual.maps.networkmap.rev151021.network.map.Map> networkMap = new LinkedList<>();
-        org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic
+        org.opendaylight.yang.gen.v1.urn.alto
                 .manual.maps.networkmap.rev151021.network.map.MapBuilder builder =
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic
+                new org.opendaylight.yang.gen.v1.urn.alto
                         .manual.maps.networkmap.rev151021.network.map.MapBuilder();
 
         List<IpPrefix> prefixList = aggregateAddressesList(addressesList);

diff --git a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/alto/basic/manual/maps/ManualMapsUtils.java b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/alto/basic/manual/maps/ManualMapsUtils.java
index d7f42c788488560a86e0400d26bfabfb4d6c8457..ee55a1b18d4566137fe5f31dc6bf719e276f8172 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/alto/basic/manual/maps/ManualMapsUtils.java
+++ b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/alto/basic/manual/maps/ManualMapsUtils.java
@@ -11,19 +11,19 @@ package org.opendaylight.alto.basic.manual.maps;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.cost.map.Meta;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.network.map.Map;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.ConfigContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.ConfigContextBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.ConfigContextKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceCostMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceCostMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceCostMapKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceNetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceNetworkMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceNetworkMapKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.Tag;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.cost.map.Meta;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.network.map.Map;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.ConfigContext;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.ConfigContextBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.ConfigContextKey;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceCostMap;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceCostMapBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceCostMapKey;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceNetworkMap;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceNetworkMapBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceNetworkMapKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.Tag;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.Identifier;
@@ -129,7 +129,7 @@ public class ManualMapsUtils {
 
     public static InstanceIdentifier<ResourceCostMap> createResourceCostMap(String rid,
             Meta meta,
-            List<org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.cost.map.Map> costMap,
+            List<org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.cost.map.Map> costMap,
             WriteTransaction wx) {
         InstanceIdentifier<ResourceCostMap> iid = getResourceCostMapIID(rid);
         ResourceCostMapBuilder builder = new ResourceCostMapBuilder();

diff --git a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/endpointproperty/rev151021/EndpointPropertyTypeBuilder.java b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/endpointproperty/rev151021/EndpointPropertyTypeBuilder.java
similarity index 87%
rename from alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/endpointproperty/rev151021/EndpointPropertyTypeBuilder.java
rename to alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/endpointproperty/rev151021/EndpointPropertyTypeBuilder.java
index 5abf6ed0475f854f9ddf7a7e17c8e303494e9d39..fa086a17b7c090268541097762f6fa035ca70e37 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/endpointproperty/rev151021/EndpointPropertyTypeBuilder.java
+++ b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/endpointproperty/rev151021/EndpointPropertyTypeBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.endpointproperty.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.endpointproperty.rev151021;
 
 
 /**

diff --git a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/endpointproperty/rev151021/TypedEndpointAddressBuilder.java b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/endpointproperty/rev151021/TypedEndpointAddressBuilder.java
similarity index 87%
rename from alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/endpointproperty/rev151021/TypedEndpointAddressBuilder.java
rename to alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/endpointproperty/rev151021/TypedEndpointAddressBuilder.java
index fbb2deee193afe44f5ede1be703768b3a9e3fe9b..1a7bd97f2fa99f0b3f4b709479e6e3ceed1549d4 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/endpointproperty/rev151021/TypedEndpointAddressBuilder.java
+++ b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/endpointproperty/rev151021/TypedEndpointAddressBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.endpointproperty.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.endpointproperty.rev151021;
 
 
 /**

diff --git a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/networkmap/rev151021/EndpointAddressTypeBuilder.java b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/networkmap/rev151021/EndpointAddressTypeBuilder.java
similarity index 90%
rename from alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/networkmap/rev151021/EndpointAddressTypeBuilder.java
rename to alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/networkmap/rev151021/EndpointAddressTypeBuilder.java
index 1c8f6f945d531402a494577e4dc445568630d260..94a49fb38d52978347452ea3c98f3672a0f22a74 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/networkmap/rev151021/EndpointAddressTypeBuilder.java
+++ b/alto-basic/manual-maps/api/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/networkmap/rev151021/EndpointAddressTypeBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021;
 
 
 /**

diff --git a/alto-basic/manual-maps/api/src/main/yang/alto-costmap-config.yang b/alto-basic/manual-maps/api/src/main/yang/alto-costmap-config.yang
index 8463faa7114f098153705c69ad8a97a73badbbb4..34789448e8eb3ed89c0c2aa3d1dae62d31b0cbdb 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/yang/alto-costmap-config.yang
+++ b/alto-basic/manual-maps/api/src/main/yang/alto-costmap-config.yang
@@ -1,7 +1,7 @@
 module alto-costmap-config {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:basic:manual:maps:costmap";
+    namespace "urn:alto:manual:maps:costmap";
 
     prefix "alto-costmap-config";
 

diff --git a/alto-basic/manual-maps/api/src/main/yang/alto-endpointcost-config.yang b/alto-basic/manual-maps/api/src/main/yang/alto-endpointcost-config.yang
index 1121ea844988bb92cc12ac8b6bb4f4822965fa33..7b261faa51fb030497e65fae07ecbdb730c0ed67 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/yang/alto-endpointcost-config.yang
+++ b/alto-basic/manual-maps/api/src/main/yang/alto-endpointcost-config.yang
@@ -1,7 +1,7 @@
 module alto-endpointcost-config {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:basic:manual:maps:endpointcost";
+    namespace "urn:alto:manual:maps:endpointcost";
 
     prefix "alto-endpointcost-config";
 

diff --git a/alto-basic/manual-maps/api/src/main/yang/alto-endpointproperty-config.yang b/alto-basic/manual-maps/api/src/main/yang/alto-endpointproperty-config.yang
index eb9ae1bf55ce1c8937469544b6c9aa3ffdbc4d41..cbced86892fc562032d3dfd3b1ec54b9351c784e 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/yang/alto-endpointproperty-config.yang
+++ b/alto-basic/manual-maps/api/src/main/yang/alto-endpointproperty-config.yang
@@ -1,7 +1,7 @@
 module alto-endpointproperty-config {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:basic:manual:maps:endpointproperty";
+    namespace "urn:alto:manual:maps:endpointproperty";
 
     prefix "alto-endpointproperty-config";
 

diff --git a/alto-basic/manual-maps/api/src/main/yang/alto-manual-maps.yang b/alto-basic/manual-maps/api/src/main/yang/alto-manual-maps.yang
index d34cb1321ec14c3cb5b13468a6a9372f403335ad..202e120ce31446e52ae10873f36e59e0bb6de6b5 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/yang/alto-manual-maps.yang
+++ b/alto-basic/manual-maps/api/src/main/yang/alto-manual-maps.yang
@@ -1,7 +1,7 @@
 module alto-manual-maps {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:basic:manual:maps";
+    namespace "urn:alto:manual:maps";
 
     prefix "alto-manual-maps";
 

diff --git a/alto-basic/manual-maps/api/src/main/yang/alto-networkmap-config.yang b/alto-basic/manual-maps/api/src/main/yang/alto-networkmap-config.yang
index 6f5262133bd4d7f9b4e2e78d7ea152428b7cf87c..ad32df9dcaeb4a5abfd12fe5f9211d67c0b59155 100644 (file)
--- a/alto-basic/manual-maps/api/src/main/yang/alto-networkmap-config.yang
+++ b/alto-basic/manual-maps/api/src/main/yang/alto-networkmap-config.yang
@@ -1,7 +1,7 @@
 module alto-networkmap-config {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:basic:manual:maps:networkmap";
+    namespace "urn:alto:manual:maps:networkmap";
 
     prefix "alto-networkmap-config";
 

diff --git a/alto-basic/manual-maps/impl/src/main/config/default-config.xml b/alto-basic/manual-maps/impl/src/main/config/default-config.xml
index d0c04dc06b9892fa89e0a1367810e6df7293a248..e299942f11f5035eba4db2e43e36b2f9c39592f4 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/config/default-config.xml
+++ b/alto-basic/manual-maps/impl/src/main/config/default-config.xml
@@ -9,23 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:basic:manual:maps:impl?module=alto-manual-maps-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:manual:maps:impl?module=alto-manual-maps-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
   </required-capabilities>
   <configuration>
 
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:basic:manual:maps:impl">prefix:alto-manual-maps</type>
+          <type xmlns:prefix="urn:alto:manual:maps:impl">prefix:alto-manual-maps</type>
           <name>alto-manual-maps-default</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
           </broker>
           <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:opendaylight:alto:core:northbound">alto-northbound-router:alto-northbound-router</type>
+            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
             <name>alto-northbound-router</name>
           </alto-northbound-router>
         </module>

diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualCostmapServiceImpl.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualCostmapServiceImpl.java
index 10c0f22c5291e6ae00053030400a4e5fdcb78903..eae0bbfc8991c9b258dec2443e7f0bf3e6f4bbba 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualCostmapServiceImpl.java
+++ b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualCostmapServiceImpl.java
@@ -12,15 +12,15 @@ import org.opendaylight.alto.basic.manual.maps.ManualMapsUtils;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.cost.map.Map;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.cost.map.map.DstCosts;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.cost.map.map.dst.costs.Cost;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.cost.map.map.dst.costs.cost.TypeNumerical;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.cost.map.map.dst.costs.cost.TypeOrdinal;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceCostMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.cost.map.Map;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.cost.map.map.DstCosts;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.cost.map.map.dst.costs.Cost;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.cost.map.map.dst.costs.cost.TypeNumerical;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.cost.map.map.dst.costs.cost.TypeOrdinal;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceCostMap;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryOutput;

diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualNetworkmapServiceImpl.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualNetworkmapServiceImpl.java
index 9fcc28a24d4b24c2701915eb25d6376c26971174..553763d11facb0a7e6d6b8d3a4a32b41dc21a597 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualNetworkmapServiceImpl.java
+++ b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualNetworkmapServiceImpl.java
@@ -15,13 +15,13 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.EndpointAddressType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.endpoint.address.group.EndpointAddressGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.network.map.Map;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceNetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.EndpointAddressType;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.endpoint.address.group.EndpointAddressGroup;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.network.map.Map;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceNetworkMap;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv4;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv6;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AltoModelNetworkmapService;

diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoModelConfigImpl.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoModelConfigImpl.java
index 8c294423c0909bd7e388379bd3ed780d3d6c5950..f9791b7946fb019056409404144a85d487ecd5f0 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoModelConfigImpl.java
+++ b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoModelConfigImpl.java
@@ -15,14 +15,14 @@ import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.ConfigResponseData1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.Meta1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceCostMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.config.context.ResourceNetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.query.input.request.config.request.config.request.message.config.resource.data.ConfigCostmapData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.query.input.request.config.request.config.request.message.config.resource.data.ConfigNetworkmapData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.query.output.response.config.response.config.response.message.config.response.data.ConfigCostmapResponseDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.query.output.response.config.response.config.response.message.config.response.data.ConfigNetworkmapResponseDataBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.ConfigResponseData1Builder;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.Meta1Builder;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceCostMap;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.config.context.ResourceNetworkMap;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.query.input.request.config.request.config.request.message.config.resource.data.ConfigCostmapData;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.query.input.request.config.request.config.request.message.config.resource.data.ConfigNetworkmapData;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.query.output.response.config.response.config.response.message.config.response.data.ConfigCostmapResponseDataBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.query.output.response.config.response.config.response.message.config.response.data.ConfigNetworkmapResponseDataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.config.rev151021.AltoModelConfigService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.config.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.config.rev151021.QueryOutput;

diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/ManualMapsListener.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/ManualMapsListener.java
index 9347641f5894983934eb7da1d45a51a35df8f9b0..6ae9331af21f21d4f953a4cc1ab4836a1b8c96b5 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/ManualMapsListener.java
+++ b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/ManualMapsListener.java
@@ -21,11 +21,11 @@ import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.costmap.rev151021.CostMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.networkmap.rev151021.NetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.rev151021.ConfigContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ServiceContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.costmap.rev151021.CostMap;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.networkmap.rev151021.NetworkMap;
+import org.opendaylight.yang.gen.v1.urn.alto.manual.maps.rev151021.ConfigContext;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ServiceContext;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.config.rev151021.ResourceTypeConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeCostmap;

diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModule.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModule.java
similarity index 93%
rename from alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModule.java
rename to alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModule.java
index c71377c8b8d55f74771d1c40ece11153ff13854a..851411180bd2ee36a397159233a89f7f19a5c0f3 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModule.java
+++ b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModule.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.impl.rev151021;
 
 import org.opendaylight.alto.basic.impl.AltoManualMapsProvider;
 

diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java
similarity index 81%
rename from alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java
rename to alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java
index 5a637daed0a3f5613860ada2dd84b1580d57d66b..6ffc82394c0bc7cab605b3a9d7edbfbccfe40531 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java
+++ b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.impl.rev151021;
 public class AltoManualMapsModuleFactory extends AbstractAltoManualMapsModuleFactory {
 
 }

diff --git a/alto-basic/manual-maps/impl/src/main/yang/alto-manual-maps-impl.yang b/alto-basic/manual-maps/impl/src/main/yang/alto-manual-maps-impl.yang
index 16fd407856a1c15057bef9fe9fd0eb4191654d69..5e66c83e2b3c7bb6eec6a8c0189d42e8ce92e55f 100644 (file)
--- a/alto-basic/manual-maps/impl/src/main/yang/alto-manual-maps-impl.yang
+++ b/alto-basic/manual-maps/impl/src/main/yang/alto-manual-maps-impl.yang
@@ -1,6 +1,6 @@
 module alto-manual-maps-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:basic:manual:maps:impl";
+    namespace "urn:alto:manual:maps:impl";
     prefix "alto-manual-maps";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java b/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java
similarity index 85%
rename from alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java
rename to alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java
index 7d3b401cd75b9dd07177bc2d0363f12f0e03ffc7..b392f60ceb2b5458e83b9db7f0a17f5a7ecfe772 100644 (file)
--- a/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java
+++ b/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.impl.rev151021;
 
 import org.junit.Test;
 

diff --git a/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java b/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java
similarity index 87%
rename from alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java
rename to alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java
index f30fed95263e207d62dc9007c39ef38dbdebb728..85bbb52b183ea2b0960577d1dd142a10b7bfd3a1 100644 (file)
--- a/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java
+++ b/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.manual.maps.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.impl.rev151021;
 
 import org.junit.Test;
 import org.opendaylight.alto.basic.impl.AltoManualMapsProvider;

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java
index 6868a4d3d145e7cfe520e5d1db828c3b1a1c8f99..b85eb5108fb5cb703fb5a75455f27823a5235759 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java
@@ -19,8 +19,8 @@ import org.opendaylight.alto.basic.endpointcostservice.util.LinkNode;
 import org.opendaylight.alto.basic.endpointcostservice.helper.UtilHelper;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostTypeData;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostTypeData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.TypedAddressData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.endpoint.cost.Cost;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.cost.Numerical;

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/EndpointcostserviceProvider.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/EndpointcostserviceProvider.java
index 9300047e01f39c81412900a1dbd064fb1584286b..46719490a0004779aa8bb55b20199b55adbf12cd 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/EndpointcostserviceProvider.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/EndpointcostserviceProvider.java
@@ -17,8 +17,8 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutput;

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/base/BaseECSImplementation.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/base/BaseECSImplementation.java
index 81696a442b3d8e34546f079e85f96142c2b119fb..1deec47510b83499868699bc1b42a8283f5d000a 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/base/BaseECSImplementation.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/base/BaseECSImplementation.java
@@ -11,7 +11,7 @@ package org.opendaylight.alto.basic.endpointcostservice.impl.base;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostTypeData;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostTypeData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutputBuilder;

diff --git a/alto-basic/simple-ird/api/src/main/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtils.java b/alto-basic/simple-ird/api/src/main/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtils.java
index cf49da68882290aed48aa4cd45b3e07c80acb29c..f17ae38e178473fb4f3cf9acb9a411db6f93b3dc 100644 (file)
--- a/alto-basic/simple-ird/api/src/main/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtils.java
+++ b/alto-basic/simple-ird/api/src/main/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtils.java
@@ -18,18 +18,18 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfigurationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.configuration.data.location.RelativePathBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntryKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryKey;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceKey;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfigurationKey;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.configuration.data.location.RelativePathBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntryKey;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryKey;
+
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 

diff --git a/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang b/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang
index c1d45bf4b6bfe3d12a5e599ea6484a821eeef269..c362fc0c565986f84231184c14a4830e1c49cac2 100644 (file)
--- a/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang
+++ b/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang
@@ -1,7 +1,7 @@
 module alto-simple-ird-rfc7285 {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:basic:simple:ird:rfc7285";
+    namespace "urn:alto:simple:ird:rfc7285";
 
     prefix "simple-ird-rfc7285";
 

diff --git a/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird.yang b/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird.yang
index 886d3a42cc206242d3991899c51fa9dd60dc0c53..0a36401049395c2cab04a00023fb47fd934cbba7 100644 (file)
--- a/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird.yang
+++ b/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird.yang
@@ -1,7 +1,7 @@
 module alto-simple-ird {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:basic:simple:ird";
+    namespace "urn:alto:simple:ird";
 
     prefix "alto-simple-ird";
 

diff --git a/alto-basic/simple-ird/impl/src/main/config/default-config.xml b/alto-basic/simple-ird/impl/src/main/config/default-config.xml
index b88d0cd0ca48b222258dc1fe90054f2c3e34c136..38bda233c2ecbc3af190c059cc544dbf97dc1cae 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/config/default-config.xml
+++ b/alto-basic/simple-ird/impl/src/main/config/default-config.xml
@@ -9,23 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:basic:simple:ird:impl?module=alto-simple-ird-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:simple:ird:impl?module=alto-simple-ird-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
   </required-capabilities>
   <configuration>
 
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:basic:simple:ird:impl">prefix:alto-simple-ird</type>
+          <type xmlns:prefix="urn:alto:simple:ird:impl">prefix:alto-simple-ird</type>
           <name>alto-simple-ird-default</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
           </broker>
           <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:opendaylight:alto:core:northbound">alto-northbound-router:alto-northbound-router</type>
+            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
             <name>alto-northbound-router</name>
           </alto-northbound-router>
         </module>

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java
index f68b3b5e525a26fae8e02668ee0d6c1c8060f7fe..84d80a33ec2a06fb4d19bb331aed002dea0d13b7 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoSimpleIrdProvider.java
@@ -18,12 +18,12 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.Information;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.InformationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfigurationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.Information;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.InformationBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfigurationBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListener.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListener.java
index fea401cf6c49a02ca77a248ee9a114e73610b7ea..257ef14c572e0529db9634ab8a4f30cbbeacac18 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListener.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListener.java
@@ -29,22 +29,22 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.Context;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ContextKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.ResourceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagKey;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.Tag;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
+
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.Context;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ContextKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.ResourceKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagKey;
+
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.Tag;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.ird.rev151021.ResourceTypeIrd;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeCostmap;

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdListener.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdListener.java
index d7a411d2f7df9276c608dc52d28b5d4b27d9d6a8..feb94bf5cbcd97b1d1e8f2f827bcad83d784cb9a 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdListener.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdListener.java
@@ -26,17 +26,17 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.Context;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ContextKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.Context;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ContextKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.ird.rev151021.ResourceTypeIrd;
 

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdRoute.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdRoute.java
index ef54beeebd7f9fb2e1369d5d22a56d16ec7c7b52..62b35e2dcdfcef43166223d00e78462e2b3347e3 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdRoute.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/SimpleIrdRoute.java
@@ -24,17 +24,17 @@ import javax.ws.rs.core.Response;
 
 import org.opendaylight.alto.core.northbound.api.AltoNorthboundRoute;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.configuration.data.location.FixedUrl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.configuration.data.location.RelativePath;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.data.EntryCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMeta;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostType;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.configuration.data.location.FixedUrl;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.configuration.data.location.RelativePath;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.data.EntryCapabilities;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilities;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMeta;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostType;
+
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
 @Path("/")
 public class SimpleIrdRoute implements AltoNorthboundRoute {

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285CostTypeListener.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285CostTypeListener.java
index 4ac4e62bce98229dc9f1804811ac4be4b2df059f..1892fc46c5a0ab8e50c4a713f46159ce8b4025e2 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285CostTypeListener.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285CostTypeListener.java
@@ -22,22 +22,22 @@ import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataCh
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.data.EntryCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.ird.instance.MetaBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostTypeBuilder;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostTypeData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.data.EntryCapabilities;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
+
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilities;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadataBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.ird.instance.MetaBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostType;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostTypeBuilder;
+
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostTypeData;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeCostmap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeFilteredCostmap;

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java
index cfdfbd237a9bf21f211d772b6bc0fa87739648b8..d7047d12d9cafbd822a7c79a98976d80c726bd93 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java
@@ -22,17 +22,17 @@ import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataCh
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdConfigurationMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.ird.instance.MetaBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdConfigurationMetadata;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadataBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.ird.instance.MetaBuilder;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.ResourceTypeNetworkmap;
 

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModule.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModule.java
similarity index 78%
rename from alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModule.java
rename to alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModule.java
index 10fc5756f5677745440fda2a11e3fd7029522101..2269461cfe502ee617b5bb28e990e745cd65ebad 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModule.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModule.java
@@ -1,13 +1,13 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.simple.ird.impl.rev151021;
 
 import org.opendaylight.alto.basic.impl.AltoSimpleIrdProvider;
 
-public class AltoSimpleIrdModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.impl.rev151021.AbstractAltoSimpleIrdModule {
+public class AltoSimpleIrdModule extends org.opendaylight.yang.gen.v1.urn.alto.simple.ird.impl.rev151021.AbstractAltoSimpleIrdModule {
     public AltoSimpleIrdModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AltoSimpleIrdModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.impl.rev151021.AltoSimpleIrdModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AltoSimpleIrdModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.simple.ird.impl.rev151021.AltoSimpleIrdModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactory.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactory.java
similarity index 66%
rename from alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactory.java
rename to alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactory.java
index 1c2c24beed521f04e1ac5aefeffdcc1f9bd07ff0..52b3b7ff1942f28b42e841935ec8ecfa5a2e85d1 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactory.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.impl.rev151021;
-public class AltoSimpleIrdModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.impl.rev151021.AbstractAltoSimpleIrdModuleFactory {
+package org.opendaylight.yang.gen.v1.urn.alto.simple.ird.impl.rev151021;
+public class AltoSimpleIrdModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.simple.ird.impl.rev151021.AbstractAltoSimpleIrdModuleFactory {
 
 }

diff --git a/alto-basic/simple-ird/impl/src/main/yang/alto-simple-ird-impl.yang b/alto-basic/simple-ird/impl/src/main/yang/alto-simple-ird-impl.yang
index e510747c4d8dc94377510535d801c7ce26479ac6..c1a2d81b238272efc1a960e4bc0328fea33ed51e 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/yang/alto-simple-ird-impl.yang
+++ b/alto-basic/simple-ird/impl/src/main/yang/alto-simple-ird-impl.yang
@@ -1,6 +1,6 @@
 module alto-simple-ird-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:basic:simple:ird:impl";
+    namespace "urn:alto:simple:ird:impl";
     prefix "alto-simple-ird-impl";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListenerTest.java b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListenerTest.java
index 766937d85dd3e7f4a1a6be33e091faba8d09dcdd..e5e3bc307c4cbcd913a69c5c3dc4998b9d468b1f 100644 (file)
--- a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListenerTest.java
+++ b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdEntryListenerTest.java
@@ -22,21 +22,21 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfigurationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfigurationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.configuration.data.location.FixedUrlBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.Context;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ContextKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.ResourceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.ResourceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.Tag;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfigurationBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfigurationKey;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.configuration.data.location.FixedUrlBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.Context;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ContextKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.ResourceBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.ResourceKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.Tag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeFilteredCostmap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.ResourceTypeEndpointcost;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.ird.rev151021.ResourceTypeIrd;

diff --git a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdListenerTest.java b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdListenerTest.java
index 3a67ffb56f83b71305118b6875b176a942b5712e..7d76bb85de7254d12561dcc412c7184957eeb75b 100644 (file)
--- a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdListenerTest.java
+++ b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdListenerTest.java
@@ -19,12 +19,12 @@ import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfigurationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfigurationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.Context;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ContextKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfigurationBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfigurationKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.Context;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ContextKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

diff --git a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdRouteTest.java b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdRouteTest.java
index b329831dca037834bcc7c16babaf85dadf5512e2..b65f03bc01136f0a3724cc7b0ef673a70f05b96b 100644 (file)
--- a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdRouteTest.java
+++ b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/impl/SimpleIrdRouteTest.java
@@ -12,21 +12,21 @@ package org.opendaylight.alto.basic.impl;
 import com.google.common.collect.Maps;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.configuration.data.location.FixedUrlBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.configuration.data.location.RelativePathBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.entry.data.EntryCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.ird.instance.MetaBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostTypeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.configuration.data.location.FixedUrlBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.configuration.data.location.RelativePathBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.entry.data.EntryCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilities;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285CostTypeCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadata;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.Rfc7285IrdMetadataBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.ird.instance.MetaBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostType;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rfc7285.rev151021.rfc7285.ird.meta.CostTypeBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Response;

diff --git a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtilsTest.java b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtilsTest.java
index 56e4f11b1cd4ae235edb873c2651d12aa8cad91d..f982774d842460846db119b37a6f1ba0959b9b67 100644 (file)
--- a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtilsTest.java
+++ b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/alto/basic/simpleird/SimpleIrdUtilsTest.java
@@ -14,16 +14,16 @@ import com.google.common.util.concurrent.Futures;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfiguration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceConfigurationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.IrdInstanceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.IrdEntryKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstance;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfiguration;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceConfigurationKey;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.IrdInstanceKey;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.IrdEntryKey;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntry;
+import org.opendaylight.yang.gen.v1.urn.alto.simple.ird.rev151021.ird.instance.configuration.IrdConfigurationEntryKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 import static org.mockito.Mockito.mock;

diff --git a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactoryTest.java b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactoryTest.java
similarity index 85%
rename from alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactoryTest.java
rename to alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactoryTest.java
index ab000a6f366439e206554c0780bb8bc8016fe4ba..4cf9de451310014ae3a751adee2702235055cbda 100644 (file)
--- a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactoryTest.java
+++ b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleFactoryTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.simple.ird.impl.rev151021;
 
 import org.junit.Test;
 

diff --git a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleTest.java b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleTest.java
similarity index 96%
rename from alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleTest.java
rename to alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleTest.java
index a22abd388c43426ad91bb79848e8073a72af3002..f103fd7a966d1fbe651675250a2331c2596fbdc5 100644 (file)
--- a/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/basic/simple/ird/impl/rev151021/AltoSimpleIrdModuleTest.java
+++ b/alto-basic/simple-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/simple/ird/impl/rev151021/AltoSimpleIrdModuleTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.basic.simple.ird.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.simple.ird.impl.rev151021;
 
 import org.junit.Test;
 import org.opendaylight.alto.basic.impl.AltoSimpleIrdProvider;

diff --git a/alto-core/basic-types/src/main/yang/types.yang b/alto-core/basic-types/src/main/yang/types.yang
index 3903f045358fe32a70b02ed9629467a32bfdca1f..bf40c8f116cf75ddffc52a9792ed039e285b5382 100644 (file)
--- a/alto-core/basic-types/src/main/yang/types.yang
+++ b/alto-core/basic-types/src/main/yang/types.yang
@@ -1,7 +1,7 @@
 module alto-basic-types {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:core:types";
+    namespace "urn:alto:types";
 
     prefix "alto-basic-types";
 

diff --git a/alto-core/northbound/api/src/main/yang/alto-northbound.yang b/alto-core/northbound/api/src/main/yang/alto-northbound.yang
index e63722ee860ab3408e7e9d504b39fe9d44b75f84..acb6de0798f0dcd89eb3f52e0206942f68c1d043 100644 (file)
--- a/alto-core/northbound/api/src/main/yang/alto-northbound.yang
+++ b/alto-core/northbound/api/src/main/yang/alto-northbound.yang
@@ -1,7 +1,7 @@
 module alto-northbound {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:core:northbound";
+    namespace "urn:alto:northbound";
 
     prefix "alto-northbound";
 

diff --git a/alto-core/northbound/impl/src/main/config/default-config.xml b/alto-core/northbound/impl/src/main/config/default-config.xml
index 06d7fee4d2b48de3b3f16a3b01768f98ef12b326..2867989a49f79348fcdd8e87b5f069455bffe402 100644 (file)
--- a/alto-core/northbound/impl/src/main/config/default-config.xml
+++ b/alto-core/northbound/impl/src/main/config/default-config.xml
@@ -9,8 +9,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:alto:core:northbound:impl?module=alto-northbound-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound:impl?module=alto-northbound-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
   </required-capabilities>
   <configuration>
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:core:northbound:impl">prefix:alto-northbound</type>
+          <type xmlns:prefix="urn:alto:northbound:impl">prefix:alto-northbound</type>
           <name>alto-northbound-default</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
       <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <service>
-          <type xmlns:alto-northbound="urn:opendaylight:alto:core:northbound">alto-northbound:alto-northbound-router</type>
+          <type xmlns:alto-northbound="urn:alto:northbound">alto-northbound:alto-northbound-router</type>
           <instance>
             <name>alto-northbound-router</name>
             <provider>/modules/module[type='alto-northbound'][name='alto-northbound-default']</provider>

diff --git a/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModule.java b/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModule.java
similarity index 75%
rename from alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModule.java
rename to alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModule.java
index abcf256292e0eb84082e0ee0fce2525ba7bb9df7..6f17e3b7f3414142d8ea63f84697efd69b56e563 100644 (file)
--- a/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModule.java
+++ b/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModule.java
@@ -1,13 +1,13 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.impl.rev151021;
 
 import org.opendaylight.alto.core.northbound.impl.AltoNorthboundProvider;
 
-public class AltoNorthboundModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.impl.rev151021.AbstractAltoNorthboundModule {
+public class AltoNorthboundModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.impl.rev151021.AbstractAltoNorthboundModule {
     public AltoNorthboundModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AltoNorthboundModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.impl.rev151021.AltoNorthboundModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AltoNorthboundModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.impl.rev151021.AltoNorthboundModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleFactory.java b/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleFactory.java
similarity index 66%
rename from alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleFactory.java
rename to alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleFactory.java
index a8d93c090a93ea36479b828999ac9c9aca24c8e1..ecba7471d111eadc8041b5ea05bf41ec8b269bd4 100644 (file)
--- a/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleFactory.java
+++ b/alto-core/northbound/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.impl.rev151021;
-public class AltoNorthboundModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.impl.rev151021.AbstractAltoNorthboundModuleFactory {
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.impl.rev151021;
+public class AltoNorthboundModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.impl.rev151021.AbstractAltoNorthboundModuleFactory {
 
 }

diff --git a/alto-core/northbound/impl/src/main/yang/alto-northbound-impl.yang b/alto-core/northbound/impl/src/main/yang/alto-northbound-impl.yang
index 13846e93e82397c25902710ac9f07004cce3b999..3254e6df82f834aab0754ef1265022427cd6e3be 100644 (file)
--- a/alto-core/northbound/impl/src/main/yang/alto-northbound-impl.yang
+++ b/alto-core/northbound/impl/src/main/yang/alto-northbound-impl.yang
@@ -1,6 +1,6 @@
 module alto-northbound-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:core:northbound:impl";
+    namespace "urn:alto:northbound:impl";
     prefix "alto-northbound-impl";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleFactoryTest.java b/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleFactoryTest.java
similarity index 85%
rename from alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleFactoryTest.java
rename to alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleFactoryTest.java
index 84a9b83fbf1a4000a8486c313bd4afde455c27e2..c0a6ed96df757d14ee8287c2e254de1def643ffa 100644 (file)
--- a/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleFactoryTest.java
+++ b/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleFactoryTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.impl.rev151021;
 
 import org.junit.Test;
 

diff --git a/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleTest.java b/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleTest.java
similarity index 96%
rename from alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleTest.java
rename to alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleTest.java
index 03d27614ac3ddddeb3e4361189e022e277ffa123..5f412776cf99e23c44c38f51ea7736645eaa16a4 100644 (file)
--- a/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/impl/rev151021/AltoNorthboundModuleTest.java
+++ b/alto-core/northbound/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/impl/rev151021/AltoNorthboundModuleTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.impl.rev151021;
 
 import org.junit.Test;
 import org.opendaylight.controller.config.api.DependencyResolver;

diff --git a/alto-core/resourcepool/api/src/main/java/org/opendaylight/alto/core/resourcepool/ResourcepoolUtils.java b/alto-core/resourcepool/api/src/main/java/org/opendaylight/alto/core/resourcepool/ResourcepoolUtils.java
index b9bf18f976dedd63c5bb02e86677eab5c8e23d8d..7516706b36aeff51ed4b212da6bc13fa15aaf0b1 100644 (file)
--- a/alto-core/resourcepool/api/src/main/java/org/opendaylight/alto/core/resourcepool/ResourcepoolUtils.java
+++ b/alto-core/resourcepool/api/src/main/java/org/opendaylight/alto/core/resourcepool/ResourcepoolUtils.java
@@ -27,22 +27,22 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcR
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ResourceType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ServiceContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.Context;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ContextBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.ContextKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.ResourceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.ResourceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.Capabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagKey;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.Tag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ResourceType;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ServiceContext;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.Context;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ContextBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.ContextKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.ResourceBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.ResourceKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.Capabilities;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagKey;
+
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.Tag;
 
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

diff --git a/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang b/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang
index daa6eb9489b8a57b6057c18c7bcc6144263b972b..a0a198a58f2d64168f3b8298f286b70d2a1152d7 100644 (file)
--- a/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang
+++ b/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang
@@ -1,7 +1,7 @@
 module alto-resourcepool {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:core:resourcepool";
+    namespace "urn:alto:resourcepool";
 
     prefix "alto-resourcepool";
 

diff --git a/alto-core/standard-northbound-routes/costmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/AltoNbrCostmapUtils.java b/alto-core/standard-northbound-routes/costmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/AltoNbrCostmapUtils.java
index d9e5ba0b51f97c5a7c7bea654f44dfcd0ad05328..0038e540edefa22dd2e9bc06eb1523f116ffd325 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/AltoNbrCostmapUtils.java
+++ b/alto-core/standard-northbound-routes/costmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/AltoNbrCostmapUtils.java
@@ -12,11 +12,11 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.rev151021.Records;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.rev151021.records.Record;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.rev151021.records.RecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.rev151021.records.RecordKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.Records;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.records.Record;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.records.RecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.records.RecordKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class AltoNbrCostmapUtils {

diff --git a/alto-core/standard-northbound-routes/costmap/api/src/main/yang/alto-nbr-costmap.yang b/alto-core/standard-northbound-routes/costmap/api/src/main/yang/alto-nbr-costmap.yang
index ecc97d1356c3b66d436e60e2aef3e30d01efb46c..ae0bf2596e86e261d58c6ec2717d48927ad852bc 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/api/src/main/yang/alto-nbr-costmap.yang
+++ b/alto-core/standard-northbound-routes/costmap/api/src/main/yang/alto-nbr-costmap.yang
@@ -1,7 +1,7 @@
 module alto-nbr-costmap {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:core:northbound:route:costmap";
+    namespace "urn:alto:northbound:route:costmap";
 
     prefix "alto-nbr-costmap";
 

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/main/config/default-config.xml b/alto-core/standard-northbound-routes/costmap/impl/src/main/config/default-config.xml
index cecae781730db3f2dba9fa6151e7090a59659db6..40567b8a33376612326d62ca1a78be35d37f7a14 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/main/config/default-config.xml
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/main/config/default-config.xml
@@ -9,23 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:core:northbound:route:costmap:impl?module=alto-northbound-route-costmap-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound:route:costmap:impl?module=alto-northbound-route-costmap-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
   </required-capabilities>
   <configuration>
 
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:core:northbound:route:costmap:impl">prefix:alto-northbound-route-costmap-impl</type>
+          <type xmlns:prefix="urn:alto:northbound:route:costmap:impl">prefix:alto-northbound-route-costmap-impl</type>
           <name>alto-northbound-route-costmap</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
           </broker>
           <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:opendaylight:alto:core:northbound">alto-northbound-router:alto-northbound-router</type>
+            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
             <name>alto-northbound-router</name>
           </alto-northbound-router>
         </module>

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java
index 269db2a0d6f7ce5d1585cbcf9ad65bd46301c15a..960552e6ed071b1f3c7dd785bfac4e42494b60bf 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java
@@ -25,14 +25,14 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.rev151021.Records;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.rev151021.records.Record;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.rev151021.records.RecordKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.Records;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.records.Record;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.records.RecordKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryInputBuilder;

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModule.java b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModule.java
similarity index 72%
rename from alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModule.java
rename to alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModule.java
index 6bb00b95a45f4e243d73cc2bf6d307ae477b7aad..efd4574d1cc4c89772fc122cf17287f1f68532d8 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModule.java
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModule.java
@@ -1,13 +1,13 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.impl.rev151021;
 
 import org.opendaylight.alto.core.northbound.route.costmap.impl.AltoNorthboundRouteCostmap;
 
-public class AltoNorthboundRouteCostmapModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.impl.rev151021.AbstractAltoNorthboundRouteCostmapModule {
+public class AltoNorthboundRouteCostmapModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.impl.rev151021.AbstractAltoNorthboundRouteCostmapModule {
     public AltoNorthboundRouteCostmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AltoNorthboundRouteCostmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.impl.rev151021.AltoNorthboundRouteCostmapModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AltoNorthboundRouteCostmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.impl.rev151021.AltoNorthboundRouteCostmapModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModuleFactory.java b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModuleFactory.java
similarity index 63%
rename from alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModuleFactory.java
rename to alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModuleFactory.java
index 86a74c516e03e96db4b2cf2ec7572977015508ad..207e675900d1306cb9d79adfae321152b5a8b5c4 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModuleFactory.java
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/costmap/impl/rev151021/AltoNorthboundRouteCostmapModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.impl.rev151021;
-public class AltoNorthboundRouteCostmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.costmap.impl.rev151021.AbstractAltoNorthboundRouteCostmapModuleFactory {
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.impl.rev151021;
+public class AltoNorthboundRouteCostmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.impl.rev151021.AbstractAltoNorthboundRouteCostmapModuleFactory {
 
 }

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/main/yang/alto-northbound-route-costmap-impl.yang b/alto-core/standard-northbound-routes/costmap/impl/src/main/yang/alto-northbound-route-costmap-impl.yang
index dc779cc7c341b2577ff89f6324ec9fb615f812e3..af8c831be095cf423bc0b2e49fb4320e96410f49 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/main/yang/alto-northbound-route-costmap-impl.yang
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/main/yang/alto-northbound-route-costmap-impl.yang
@@ -1,6 +1,6 @@
 module alto-northbound-route-costmap-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:core:northbound:route:costmap:impl";
+    namespace "urn:alto:northbound:route:costmap:impl";
     prefix "alto-northbound-router-costmap-impl";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java b/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java
index b3245274f3aaacf344864f7159a1caf0abb0b646..8a00544f8a1c00956efe0c5349711f9052131515 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java
@@ -24,9 +24,9 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryOutput;

diff --git a/alto-core/standard-northbound-routes/endpointcost/api/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/AltoNbrEndpointcostUtils.java b/alto-core/standard-northbound-routes/endpointcost/api/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/AltoNbrEndpointcostUtils.java
index bab3186253adb60265109e9a9be74f493577592e..0f5506843cca9266db6ee01cda27baf92077cb3e 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/api/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/AltoNbrEndpointcostUtils.java
+++ b/alto-core/standard-northbound-routes/endpointcost/api/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/AltoNbrEndpointcostUtils.java
@@ -12,9 +12,9 @@ package org.opendaylight.alto.core.northbound.route.endpointcost;
  */
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.rev151021.Records;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.rev151021.records.Record;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.rev151021.records.RecordKey;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.rev151021.Records;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.rev151021.records.Record;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.rev151021.records.RecordKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class AltoNbrEndpointcostUtils {

diff --git a/alto-core/standard-northbound-routes/endpointcost/api/src/main/yang/alto-nbr-endpointcost.yang b/alto-core/standard-northbound-routes/endpointcost/api/src/main/yang/alto-nbr-endpointcost.yang
index bee788cf55bccc9a15a4c31ac5ba67135ad383ea..834732fffedf8259c73ca7f63a2050a10cbaeec1 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/api/src/main/yang/alto-nbr-endpointcost.yang
+++ b/alto-core/standard-northbound-routes/endpointcost/api/src/main/yang/alto-nbr-endpointcost.yang
@@ -1,7 +1,7 @@
 module alto-nbr-endpointcost {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:core:northbound:route:endpointcost";
+    namespace "urn:alto:northbound:route:endpointcost";
 
     prefix "alto-nbr-endpointcost";
 

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/config/default-config.xml b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/config/default-config.xml
index 6ec577ede6bfed9fa8f450d0ff1d4dbca47802fd..5f300b2aed49c6f9af0adde0a48bcc23e5967d8d 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/config/default-config.xml
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/config/default-config.xml
@@ -9,23 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:core:northbound:route:endpointcost:impl?module=alto-northbound-route-endpointcost-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound:route:endpointcost:impl?module=alto-northbound-route-endpointcost-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
   </required-capabilities>
   <configuration>
 
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:core:northbound:route:endpointcost:impl">prefix:alto-northbound-route-endpointcost-impl</type>
+          <type xmlns:prefix="urn:alto:northbound:route:endpointcost:impl">prefix:alto-northbound-route-endpointcost-impl</type>
           <name>alto-northbound-route-endpointcost</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
           </broker>
           <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:opendaylight:alto:core:northbound">alto-northbound-router:alto-northbound-router</type>
+            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
             <name>alto-northbound-router</name>
           </alto-northbound-router>
         </module>

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java
index 093975c54c012c4d734e23246325454f290fc351..94094286e8be9d17f2ad0b24c2d60c73f788a1a0 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java
@@ -26,13 +26,13 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.rev151021.Records;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.rev151021.records.Record;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.rev151021.records.RecordKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.rev151021.Records;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.rev151021.records.Record;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.rev151021.records.RecordKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryInputBuilder;

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModule.java b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModule.java
similarity index 71%
rename from alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModule.java
rename to alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModule.java
index 252936d4499e8471f622987360b3e81edd561135..c5e3bcf96f671025ae6ca571939d7efe05a3823c 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModule.java
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModule.java
@@ -1,13 +1,13 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.impl.rev151021;
 
 import org.opendaylight.alto.core.northbound.route.endpointcost.impl.AltoNorthboundRouteEndpointcost;
 
-public class AltoNorthboundRouteEndpointcostModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.impl.rev151021.AbstractAltoNorthboundRouteEndpointcostModule {
+public class AltoNorthboundRouteEndpointcostModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.impl.rev151021.AbstractAltoNorthboundRouteEndpointcostModule {
     public AltoNorthboundRouteEndpointcostModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AltoNorthboundRouteEndpointcostModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.impl.rev151021.AltoNorthboundRouteEndpointcostModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AltoNorthboundRouteEndpointcostModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.impl.rev151021.AltoNorthboundRouteEndpointcostModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModuleFactory.java b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModuleFactory.java
similarity index 62%
rename from alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModuleFactory.java
rename to alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModuleFactory.java
index cec93fadd0f1468972b2f5df2cf7d5fafcb65c9c..82915cc7a63e36d811b5cad4eeac9ecdd0fd15f5 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModuleFactory.java
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointcost/impl/rev151021/AltoNorthboundRouteEndpointcostModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.impl.rev151021;
-public class AltoNorthboundRouteEndpointcostModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointcost.impl.rev151021.AbstractAltoNorthboundRouteEndpointcostModuleFactory {
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.impl.rev151021;
+public class AltoNorthboundRouteEndpointcostModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointcost.impl.rev151021.AbstractAltoNorthboundRouteEndpointcostModuleFactory {
 
 }

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/yang/alto-northbound-route-endpointcost-impl.yang b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/yang/alto-northbound-route-endpointcost-impl.yang
index 3ca7d2d85d667c4c4a29bff54f8b17cba886090e..b30828e2ef7703ce0f0e8c618cce41b1deeb2425 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/yang/alto-northbound-route-endpointcost-impl.yang
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/yang/alto-northbound-route-endpointcost-impl.yang
@@ -1,6 +1,6 @@
 module alto-northbound-route-endpointcost-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:core:northbound:route:endpointcost:impl";
+    namespace "urn:alto:northbound:route:endpointcost:impl";
     prefix "alto-northbound-router-endpointcost-impl";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java b/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java
index 068e5af66b621a02782624cc0cd859bf57ad14a8..6f36932217910fc165987396fb0a8cef6507c521 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java
@@ -24,7 +24,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutput;

diff --git a/alto-core/standard-northbound-routes/endpointproperty/api/src/main/yang/alto-nbr-endpointproperty.yang b/alto-core/standard-northbound-routes/endpointproperty/api/src/main/yang/alto-nbr-endpointproperty.yang
index 27a61c46c296e89e5f1a9cf25e4019963755cdd4..0a7c55144fe6e0b32725022da25f38f5a8035adc 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/api/src/main/yang/alto-nbr-endpointproperty.yang
+++ b/alto-core/standard-northbound-routes/endpointproperty/api/src/main/yang/alto-nbr-endpointproperty.yang
@@ -1,6 +1,6 @@
 module alto-nbr-endpointproperty {
     yang-version 1;
-    namespace "urn:opendaylight:alto:core:northbound:route:endpointproperty";
+    namespace "urn:alto:northbound:route:endpointproperty";
     prefix "alto-nbr-endpointproperty";
 
     import config { prefix config; revision-date 2013-04-05; }

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/config/default-config.xml b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/config/default-config.xml
index 052794d4e34010e351f790c3fabb67fac7d16af8..f89e2cbabe3af56b57452fbc3de56ac2afa8120d 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/config/default-config.xml
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/config/default-config.xml
@@ -9,23 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:core:northbound:route:endpointproperty:impl?module=alto-northbound-route-endpointproperty-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound:route:endpointproperty:impl?module=alto-northbound-route-endpointproperty-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
   </required-capabilities>
   <configuration>
 
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:core:northbound:route:endpointproperty:impl">prefix:alto-northbound-route-endpointproperty-impl</type>
+          <type xmlns:prefix="urn:alto:northbound:route:endpointproperty:impl">prefix:alto-northbound-route-endpointproperty-impl</type>
           <name>alto-northbound-route-endpointproperty</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
           </broker>
           <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:opendaylight:alto:core:northbound">alto-northbound-router:alto-northbound-router</type>
+            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
             <name>alto-northbound-router</name>
           </alto-northbound-router>
         </module>

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java
index e23cb146fe2c137ad73f8ccadd7e6076d2ff67cf..25ec7591834aef72841747706157b45d26a7ccb5 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java
@@ -25,14 +25,14 @@ import org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.rev151021.records.Record;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.rev151021.records.RecordKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.SpecificEndpointProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.GlobalEndpointProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.rev151021.Records;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.rev151021.records.Record;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.rev151021.records.RecordKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.SpecificEndpointProperty;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.GlobalEndpointProperty;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.rev151021.Records;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.AltoModelEndpointpropertyService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryInputBuilder;

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModule.java b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModule.java
similarity index 71%
rename from alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModule.java
rename to alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModule.java
index 74a61b410077be910ad1d0731cd730cdf1a48e22..46b78965763bcc8fb75ba130ef93ca085333205d 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModule.java
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModule.java
@@ -1,13 +1,13 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.impl.rev151021;
 
 import org.opendaylight.alto.core.northbound.route.endpointproperty.impl.AltoNorthboundRouteEndpointproperty;
 
-public class AltoNorthboundRouteEndpointpropertyModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.impl.rev151021.AbstractAltoNorthboundRouteEndpointpropertyModule {
+public class AltoNorthboundRouteEndpointpropertyModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.impl.rev151021.AbstractAltoNorthboundRouteEndpointpropertyModule {
     public AltoNorthboundRouteEndpointpropertyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AltoNorthboundRouteEndpointpropertyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.impl.rev151021.AltoNorthboundRouteEndpointpropertyModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AltoNorthboundRouteEndpointpropertyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.impl.rev151021.AltoNorthboundRouteEndpointpropertyModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModuleFactory.java b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModuleFactory.java
similarity index 61%
rename from alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModuleFactory.java
rename to alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModuleFactory.java
index 814c53385d16720e373266fa257c23aeff7cd41d..b83b7a902a26f4047571afdae31b0620a6c3334c 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModuleFactory.java
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/endpointproperty/impl/rev151021/AltoNorthboundRouteEndpointpropertyModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.impl.rev151021;
-public class AltoNorthboundRouteEndpointpropertyModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.endpointproperty.impl.rev151021.AbstractAltoNorthboundRouteEndpointpropertyModuleFactory {
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.impl.rev151021;
+public class AltoNorthboundRouteEndpointpropertyModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.endpointproperty.impl.rev151021.AbstractAltoNorthboundRouteEndpointpropertyModuleFactory {
 
 }

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/yang/alto-northbound-route-endpointproperty-impl.yang b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/yang/alto-northbound-route-endpointproperty-impl.yang
index fc7429f2485a16d1abc23b6290116c17ca1960f3..f43aa0670c46976ea655abea5009af87a04e63ce 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/yang/alto-northbound-route-endpointproperty-impl.yang
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/yang/alto-northbound-route-endpointproperty-impl.yang
@@ -1,6 +1,6 @@
 module alto-northbound-route-endpointproperty-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:core:northbound:route:endpointproperty:impl";
+    namespace "urn:alto:northbound:route:endpointproperty:impl";
     prefix "alto-northbound-router-endpointproperty-impl";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java b/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java
index 987f2248cabd31933799861257be247c3f4d4fff..3fdddf3ca3894b636db5c8a44a3246c2992638d7 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java
@@ -24,10 +24,10 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.GlobalEndpointProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.SpecificEndpointProperty;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.GlobalEndpointProperty;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.SpecificEndpointProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.AltoModelEndpointpropertyService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryOutput;

diff --git a/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml b/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml
index 2fc052e2b634ed8bcbfae28fbb3b153721c3e7a4..b4e63696372867d3355bc87221a652ae9591bb11 100644 (file)
--- a/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml
+++ b/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml
@@ -9,23 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:core:northbound:route:example:impl?module=alto-northbound-route-example-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound:route:example:impl?module=alto-northbound-route-example-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
   </required-capabilities>
   <configuration>
 
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:core:northbound:route:example:impl">prefix:alto-northbound-route-example-impl</type>
+          <type xmlns:prefix="urn:alto:northbound:route:example:impl">prefix:alto-northbound-route-example-impl</type>
           <name>alto-northbound-route-example</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
           </broker>
           <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:opendaylight:alto:core:northbound">alto-northbound-router:alto-northbound-router</type>
+            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
             <name>alto-northbound-router</name>
           </alto-northbound-router>
         </module>

diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java
similarity index 73%
rename from alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java
rename to alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java
index 8e760e7c572cf301170b2a5f8bcde51380e73630..b60d48a51c6be38af75cb1cc96b00787e85807c3 100644 (file)
--- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java
+++ b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java
@@ -1,13 +1,13 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.example.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
 
 import org.opendaylight.alto.core.northbound.route.example.impl.AltoNorthboundRouteExample;
 
-public class AltoNorthboundRouteExampleModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModule {
+public class AltoNorthboundRouteExampleModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModule {
     public AltoNorthboundRouteExampleModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AltoNorthboundRouteExampleModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.example.impl.rev151021.AltoNorthboundRouteExampleModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AltoNorthboundRouteExampleModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AltoNorthboundRouteExampleModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java
similarity index 63%
rename from alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java
rename to alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java
index 0ba8754f2b502cc778cc500f29afe55dfa2d66c9..650d23edf87f5d19abe54ee672563ef468949b77 100644 (file)
--- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java
+++ b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.example.impl.rev151021;
-public class AltoNorthboundRouteExampleModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModuleFactory {
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
+public class AltoNorthboundRouteExampleModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModuleFactory {
 
 }

diff --git a/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang b/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang
index a3d636c67c555602f19eb3d6b1bf9adc6cc6da4c..22e6a5726881d8097cc247097a3dc60f338cff70 100644 (file)
--- a/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang
+++ b/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang
@@ -1,6 +1,6 @@
 module alto-northbound-route-example-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:core:northbound:route:example:impl";
+    namespace "urn:alto:northbound:route:example:impl";
     prefix "alto-northbound-router-example-impl";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java
similarity index 83%
rename from alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java
rename to alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java
index 5260fcc0a7df7a56bb1d3202126e2da23b596442..50ac5c354351385d585780073c3c8b843eecd6b0 100644 (file)
--- a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java
+++ b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.example.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
 
 import org.junit.Test;
 

diff --git a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java
similarity index 95%
rename from alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java
rename to alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java
index b63273ce2f740512971479d4bc3841c066f05e9c..355de10f4a9f4ad9485bed722380d06bdced700a 100644 (file)
--- a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java
+++ b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.example.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
 
 import org.junit.Test;
 import org.opendaylight.controller.config.api.DependencyResolver;

diff --git a/alto-core/standard-northbound-routes/networkmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/AltoNbrNetworkmapUtils.java b/alto-core/standard-northbound-routes/networkmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/AltoNbrNetworkmapUtils.java
index b8572920106bf0e540c4808998dcb05e22946f17..f12a18384c44c09f48dcd187c3cc4ae1e2a46212 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/AltoNbrNetworkmapUtils.java
+++ b/alto-core/standard-northbound-routes/networkmap/api/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/AltoNbrNetworkmapUtils.java
@@ -14,13 +14,13 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.Records;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.Record;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.RecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.RecordKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.record.AddressTypeMapping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.record.AddressTypeMappingBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.Records;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.Record;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.RecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.RecordKey;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.record.AddressTypeMapping;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.record.AddressTypeMappingBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv4;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv6;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

diff --git a/alto-core/standard-northbound-routes/networkmap/api/src/main/yang/alto-nbr-networkmap.yang b/alto-core/standard-northbound-routes/networkmap/api/src/main/yang/alto-nbr-networkmap.yang
index 0b27780db71b83dbf1ecd7dd27b02251b45228d3..2c348e9c3924ba30415e661c36f8442333bb50d8 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/api/src/main/yang/alto-nbr-networkmap.yang
+++ b/alto-core/standard-northbound-routes/networkmap/api/src/main/yang/alto-nbr-networkmap.yang
@@ -1,7 +1,7 @@
 module alto-nbr-networkmap {
     yang-version 1;
 
-    namespace "urn:opendaylight:alto:core:northbound:route:networkmap";
+    namespace "urn:alto:northbound:route:networkmap";
 
     prefix "alto-nbr-networkmap";
 

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/main/config/default-config.xml b/alto-core/standard-northbound-routes/networkmap/impl/src/main/config/default-config.xml
index 57cf60d5c9ada0f8ff53ff2fe6891c6cf0725ea1..cee01402ad51914e5ff177c04093afbafa396299 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/main/config/default-config.xml
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/main/config/default-config.xml
@@ -9,23 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:alto:core:northbound:route:networkmap:impl?module=alto-northbound-route-networkmap-impl&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound:route:networkmap:impl?module=alto-northbound-route-networkmap-impl&amp;revision=2015-10-21</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:opendaylight:alto:core:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
+      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
   </required-capabilities>
   <configuration>
 
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:alto:core:northbound:route:networkmap:impl">prefix:alto-northbound-route-networkmap-impl</type>
+          <type xmlns:prefix="urn:alto:northbound:route:networkmap:impl">prefix:alto-northbound-route-networkmap-impl</type>
           <name>alto-northbound-route-networkmap</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
           </broker>
           <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:opendaylight:alto:core:northbound">alto-northbound-router:alto-northbound-router</type>
+            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
             <name>alto-northbound-router</name>
           </alto-northbound-router>
         </module>

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java
index 6251e1158085c0109777e8fd889f03d4505000b9..c323ce36d08649b9b802bede8363c1b6c5052e29 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java
@@ -49,15 +49,15 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.Records;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.Record;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.RecordKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.record.AddressTypeMapping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.rev151021.records.record.AddressTypeMappingKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTagKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.Records;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.Record;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.RecordKey;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.record.AddressTypeMapping;
+import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.rev151021.records.record.AddressTypeMappingKey;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTagKey;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AltoModelNetworkmapService;

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModule.java b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModule.java
similarity index 72%
rename from alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModule.java
rename to alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModule.java
index e9e5fc82c6ba3cffcbd497be3c52af125eb5bdd4..4890142a6f0e894e74a891fb7f8e28cb82c5990a 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModule.java
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModule.java
@@ -1,13 +1,13 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.impl.rev151021;
 
 import org.opendaylight.alto.core.northbound.route.networkmap.impl.AltoNorthboundRouteNetworkmap;
 
-public class AltoNorthboundRouteNetworkmapModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.impl.rev151021.AbstractAltoNorthboundRouteNetworkmapModule {
+public class AltoNorthboundRouteNetworkmapModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.impl.rev151021.AbstractAltoNorthboundRouteNetworkmapModule {
     public AltoNorthboundRouteNetworkmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AltoNorthboundRouteNetworkmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.impl.rev151021.AltoNorthboundRouteNetworkmapModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AltoNorthboundRouteNetworkmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.impl.rev151021.AltoNorthboundRouteNetworkmapModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactory.java b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactory.java
similarity index 62%
rename from alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactory.java
rename to alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactory.java
index 82708e1bdc2aa173a71a02fd04a36bbb34785069..3bb0317527060039b514761fcfd7cdde5c68b1c0 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactory.java
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactory.java
@@ -7,7 +7,7 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.impl.rev151021;
-public class AltoNorthboundRouteNetworkmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.impl.rev151021.AbstractAltoNorthboundRouteNetworkmapModuleFactory {
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.impl.rev151021;
+public class AltoNorthboundRouteNetworkmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.impl.rev151021.AbstractAltoNorthboundRouteNetworkmapModuleFactory {
 
 }

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/main/yang/alto-northbound-route-networkmap-impl.yang b/alto-core/standard-northbound-routes/networkmap/impl/src/main/yang/alto-northbound-route-networkmap-impl.yang
index d86e47411ddea11a994eae8d2a2f6e050c63283e..7cb874f6ad5badf9ed5b5f5711aed732a4b7acf0 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/main/yang/alto-northbound-route-networkmap-impl.yang
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/main/yang/alto-northbound-route-networkmap-impl.yang
@@ -1,6 +1,6 @@
 module alto-northbound-route-networkmap-impl {
     yang-version 1;
-    namespace "urn:opendaylight:alto:core:northbound:route:networkmap:impl";
+    namespace "urn:alto:northbound:route:networkmap:impl";
     prefix "alto-northbound-router-networkmap-impl";
 
     import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundNetworkmapTest.java b/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundNetworkmapTest.java
index 994f2e13479e1e6ce8c7da7d2fc5c31857560bab..18fb8d7b0d96db2b9062a25c289377e2f3e09843 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundNetworkmapTest.java
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundNetworkmapTest.java
@@ -25,8 +25,8 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListen
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.ContextTag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv4;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv6;

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactoryTest.java b/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactoryTest.java
similarity index 83%
rename from alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactoryTest.java
rename to alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactoryTest.java
index 2cb13701d016f52f8a2230c2f79bd8bf74ce1600..1887c9bc34baea35f658c6965bce8ffae6e579d3 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactoryTest.java
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleFactoryTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.impl.rev151021;
 
 import org.junit.Test;
 

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleTest.java b/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleTest.java
similarity index 95%
rename from alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleTest.java
rename to alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleTest.java
index 76db01054b644561faf7c4a38e3481c05ffd821c..d9eabb64aead69cf00c74edf5e98c9eb3b10163d 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/core/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleTest.java
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/networkmap/impl/rev151021/AltoNorthboundRouteNetworkmapModuleTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.northbound.route.networkmap.impl.rev151021;
+package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.networkmap.impl.rev151021;
 
 import org.junit.Test;
 import org.opendaylight.controller.config.api.DependencyResolver;

diff --git a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java
index d5ae61e236c5e188843c8e606b8fef6ff0cef9df..87bdbe861d723e64caa12b223b2f9ab9e1394254 100644 (file)
--- a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java
+++ b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java
@@ -25,9 +25,9 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils;
 import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.AltoModelBaseService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.ResourceTypeError;

diff --git a/alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java b/alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java
index c57180afac35619901d5a40690c139d5324ac69c..2a25c27ae6bf4287651bd9eb3a23a8c9e6e5c49e 100644 (file)
--- a/alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java
+++ b/alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.alto.core.service.model.costmap;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.context.resource.capabilities.CostType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.context.resource.capabilities.CostTypeBuilder;
 

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java
index fba5c153c2ac4510f7ee98a1c034bb57cb00cf71..1d96023953adc64c229004609b382e99de11d478 100644 (file)
--- a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java
+++ b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java
@@ -27,12 +27,12 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryInput;

diff --git a/alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java b/alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java
index ce21a94ebee93d0594979778890128e0d531b62d..5512640e9688e63df7a2c4e2ed52392e1a4bbe9d 100644 (file)
--- a/alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java
+++ b/alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.alto.core.service.model.endpointcost;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.context.resource.capabilities.CostType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.context.resource.capabilities.CostTypeBuilder;

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java
index 6839ac24913007f1672571ad1e6041ad6e0f7aa3..d268a3b4c740e0a396244380fe70d9a386d0cf28 100644 (file)
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java
+++ b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java
@@ -30,12 +30,12 @@ import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils;
 import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener;
 import org.opendaylight.alto.core.service.model.endpointcost.EndpointcostUtils;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostTypeData;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostTypeData;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostType;

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java
index 611539f3bbf3ba1e71bcc74fc02e78fb57447a10..f3dcb2d4a733dad7ae3e7220cd5d08134b632bcb 100644 (file)
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java
+++ b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java
@@ -25,10 +25,10 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.SpecificEndpointProperty;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.SpecificEndpointProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.AltoModelEndpointpropertyService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryOutput;

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java
index c4ac085a0085ed3eff6ae0e3a1e6ebd60b0ad1cd..8d70c717aba10a48dfa7303e180692a6cbe5bf38 100644 (file)
--- a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java
+++ b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java
@@ -30,11 +30,11 @@ import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListe
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.PidName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.Tag;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.Tag;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.resourcepool.rev150921.context.Resource;
+import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv4;

diff --git a/migrate_namespace.sh b/migrate_namespace.sh
new file mode 100755 (executable)
index 0000000..bc9cff1
--- /dev/null
+++ b/migrate_namespace.sh
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2016 <Company or Individual>. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v1.0 which accompanies this distribution,
+# and is available at http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+#!/bin/bash
+
+fix_namespace() {
+       FILE=$1
+       CATEGORY=$2
+
+       sed -i "s/urn:opendaylight:alto:$CATEGORY/urn:alto/g" $FILE
+}
+
+fix_package() {
+       FILE=$1
+       CATEGORY=$2
+
+       sed -i "s/urn.opendaylight.alto.$CATEGORY/urn.alto/g" $FILE
+}
+
+fix_folder() {
+       CATEGORY=$1
+
+       for d in $(find . -wholename "*/urn/opendaylight/alto/$CATEGORY"); do
+               target=$(echo $d | sed "s/opendaylight\/alto\/$CATEGORY/alto/g")
+               mkdir -p $target
+               mv $d/* $target
+               rm -rf $d
+       done
+}
+
+
+for suffix in core basic ext; do
+       for f in $(find . -name '*.xml'); do
+               fix_namespace $f $suffix
+       done
+
+       for f in $(find . -name '*.yang'); do
+               fix_namespace $f $suffix
+       done
+
+       for f in $(find . -name '*.java'); do
+               fix_package $f $suffix
+       done
+
+       fix_folder $suffix
+done