Improve consistency of YANG model namespaces 15/28015/2
authorLorand Jakab <lojakab@cisco.com>
Wed, 7 Oct 2015 16:04:38 +0000 (19:04 +0300)
committerLorand Jakab <lojakab@cisco.com>
Thu, 8 Oct 2015 16:28:52 +0000 (19:28 +0300)
Change-Id: I5a42bd12832a0c563428dc99d7b2e120678ce4f6
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
12 files changed:
mappingservice/api/src/main/yang/mappingservice-dao.yang [moved from mappingservice/api/src/main/yang/lfm-ms-dao.yang with 62% similarity]
mappingservice/implementation/src/main/config/default-config.xml
mappingservice/implementation/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice_shell/impl/MappingServiceShellModule.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice/shell/impl/MappingServiceShellModule.java with 84% similarity]
mappingservice/implementation/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice_shell/impl/MappingServiceShellModuleFactory.java [moved from mappingservice/implementation/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice/shell/impl/MappingServiceShellModuleFactory.java with 78% similarity]
mappingservice/implementation/src/main/yang/mappingservice-impl.yang
mappingservice/implementation/src/main/yang/mappingservice-shell-impl.yang
mappingservice/inmemorydb/src/main/config/default-config.xml
mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice_dao/inmemorydb/InMemoryDbModule.java [moved from mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/ms/dao/inmemorydb/InMemoryDbModule.java with 75% similarity]
mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice_dao/inmemorydb/InMemoryDbModuleFactory.java [new file with mode: 0644]
mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/ms/dao/inmemorydb/InMemoryDbModuleFactory.java [deleted file]
mappingservice/inmemorydb/src/main/yang/lfm-ms-inmemorydb.yang [deleted file]
mappingservice/inmemorydb/src/main/yang/mappingservice-dao-inmemorydb.yang [new file with mode: 0644]

similarity index 62%
rename from mappingservice/api/src/main/yang/lfm-ms-dao.yang
rename to mappingservice/api/src/main/yang/mappingservice-dao.yang
index 3507e4a7791df076e5dfb4bc944dae2f2a9c045a..ac94b1e8404adb17d8147abeaed45a76328169a9 100644 (file)
@@ -1,6 +1,6 @@
-module lfm-ms-dao {
+module mappingservice-dao {
     yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:lfm:ms:dao";
+    namespace "urn:opendaylight:lfm:mappingservice-dao";
     prefix "ms-dao";
 
     import config { prefix config; revision-date 2013-04-05; }
@@ -8,13 +8,13 @@ module lfm-ms-dao {
     description
         "Service definition for Mapping Service DAO.";
 
-    revision "2015-07-13" {
+    revision "2015-10-07" {
         description
-            "Initial revision";
+            "Module renamed from lfm-ms-dao.";
     }
 
-    identity ms-dao {
+    identity mappingservice-dao {
         base "config:service-type";
         config:java-class "org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO";
     }
-}
\ No newline at end of file
+}
index 646f3154d2c4c7788252db6542e9f4c476af1397..6f28314466801eb527e756195eaf42f5b5474493 100644 (file)
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <snapshot>
     <required-capabilities>
-        <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:params:xml:ns:yang:controller:config:lfm:ms:dao:inmemorydb?module=lfm-ms-inmemorydb&amp;revision=2015-07-13</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl?module=mappingservice-impl&amp;revision=2015-09-06</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:shell:impl?module=mappingservice-shell-impl&amp;revision=2015-09-25</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-shell:impl?module=mappingservice-shell-impl&amp;revision=2015-09-25</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-dao:inmemorydb?module=mappingservice-dao-inmemorydb&amp;revision=2015-10-07</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:params:xml:ns:yang:controller:config:lfm:mappingservice:impl">prefix:mappingservice-impl</type>
+                    <type xmlns:msi="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl">msi:mappingservice-impl</type>
                     <name>mappingservice-default</name>
                     <rpc-registry>
                         <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
@@ -25,8 +24,8 @@
                       <name>binding-osgi-broker</name>
                     </broker>
                     <dao>
-                      <type xmlns:dao="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:ms:dao">dao:ms-dao</type>
-                      <name>lfm-ms-inmemorydb</name>
+                      <type xmlns:dao="urn:opendaylight:lfm:mappingservice-dao">dao:mappingservice-dao</type>
+                      <name>mappingservice-dao-inmemorydb</name>
                     </dao>
                     <notification-service>
                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
                     </notification-service>
                 </module>
                 <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:shell:impl">prefix:mappingservice-shell-impl</type>
+                    <type xmlns:shell="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-shell:impl">shell:mappingservice-shell-impl</type>
                     <name>mappingservice-shell-default</name>
-                    <broker>
+                    <osgi-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>
+                    </osgi-broker>
                     <mappingservice>
-                      <type xmlns:prefix="urn:opendaylight:lfm:mappingservice">prefix:mappingservice</type>
+                      <type xmlns:ms="urn:opendaylight:lfm:mappingservice">ms:mappingservice</type>
                       <name>mappingservice</name>
                     </mappingservice>
                 </module>
                 <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl">prefix:lisp-mappingservice-impl</type>
+                    <type xmlns:ms="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl">ms:lisp-mappingservice-impl</type>
                     <name>lisp-mappingservice-default</name>
                     <osgi-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>
                     </osgi-broker>
                     <mappingservice>
-                      <type xmlns:prefix="urn:opendaylight:lfm:mappingservice">prefix:mappingservice</type>
+                      <type xmlns:ms="urn:opendaylight:lfm:mappingservice">ms:mappingservice</type>
                       <name>mappingservice</name>
                     </mappingservice>
                 </module>
@@ -1,15 +1,15 @@
-package org.opendaylight.controller.config.yang.config.lfm.mappingservice.shell.impl;
+package org.opendaylight.controller.config.yang.config.lfm.mappingservice_shell.impl;
 
 import org.opendaylight.lispflowmapping.implementation.MappingServiceShell;
 
-public class MappingServiceShellModule extends org.opendaylight.controller.config.yang.config.lfm.mappingservice.shell.impl.AbstractMappingServiceShellModule {
+public class MappingServiceShellModule extends org.opendaylight.controller.config.yang.config.lfm.mappingservice_shell.impl.AbstractMappingServiceShellModule {
     private MappingServiceShell mappingServiceShell;
 
     public MappingServiceShellModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public MappingServiceShellModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.lfm.mappingservice.shell.impl.MappingServiceShellModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public MappingServiceShellModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.lfm.mappingservice_shell.impl.MappingServiceShellModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
@@ -21,7 +21,7 @@ public class MappingServiceShellModule extends org.opendaylight.controller.confi
     @Override
     public java.lang.AutoCloseable createInstance() {
         mappingServiceShell = new MappingServiceShell();
-        mappingServiceShell.setBindingAwareBroker(getBrokerDependency());
+        mappingServiceShell.setBindingAwareBroker(getOsgiBrokerDependency());
         mappingServiceShell.setMappingService(getMappingserviceDependency());
         return mappingServiceShell;
     }
@@ -3,11 +3,11 @@
 *
 * Generated from: yang module name: mappingservice-shell-impl yang module local name: mappingservice-shell-impl
 * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Sep 25 12:24:36 CEST 2015
+* Generated at: Wed Oct 07 15:26:43 EEST 2015
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.controller.config.yang.config.lfm.mappingservice.shell.impl;
-public class MappingServiceShellModuleFactory extends org.opendaylight.controller.config.yang.config.lfm.mappingservice.shell.impl.AbstractMappingServiceShellModuleFactory {
+package org.opendaylight.controller.config.yang.config.lfm.mappingservice_shell.impl;
+public class MappingServiceShellModuleFactory extends org.opendaylight.controller.config.yang.config.lfm.mappingservice_shell.impl.AbstractMappingServiceShellModuleFactory {
 
 }
index cf4d39afeee0433389902a98e89375080ff3cfe9..26bd1f8514e5cdc119a814c177a21ae15297adf4 100644 (file)
@@ -8,7 +8,7 @@ module mappingservice-impl {
     import rpc-context { prefix rpcx; revision-date 2013-06-17; }
     import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
     import mappingservice { prefix mappingservice; revision-date 2015-09-06; }
-    import lfm-ms-dao { prefix ms-dao; revision-date 2015-07-13; }
+    import mappingservice-dao { prefix ms-dao; revision-date 2015-10-07; }
 
     description
         "This module contains the base YANG definitions for
@@ -66,7 +66,7 @@ module mappingservice-impl {
                 uses config:service-ref {
                     refine type {
                         mandatory true;
-                        config:required-identity ms-dao:ms-dao;
+                        config:required-identity ms-dao:mappingservice-dao;
                     }
                 }
             }
index 4b28a9cbbd5599e11476ae2ed45b52cb81a856c1..ffa2558ef1a7d9666ea1ec4735803a9b567b5128 100644 (file)
@@ -1,7 +1,7 @@
 module mappingservice-shell-impl {
 
     yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:shell:impl";
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-shell:impl";
     prefix "mappingservice-shell-impl";
 
     import config { prefix config; revision-date 2013-04-05; }
@@ -26,7 +26,7 @@ module mappingservice-shell-impl {
     augment "/config:modules/config:module/config:configuration" {
         case mappingservice-shell-impl {
             when "/config:modules/config:module/config:type = 'mappingservice-shell-impl'";
-            container broker {
+            container osgi-broker {
                 uses config:service-ref {
                     refine type {
                         mandatory true;
index 7aabe00b01b8a2887318d1435b58978d0817ef83..4ca08875a7e4f7b2a64604dc35808b92fdba27b1 100644 (file)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <snapshot>
     <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:ms:dao?module=lfm-ms-dao&amp;revision=2015-07-13</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-dao:inmemorydb?module=mappingservice-dao-inmemorydb&amp;revision=2015-10-07</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:params:xml:ns:yang:controller:config:lfm:ms:dao:inmemorydb">
-                        prefix:lfm-ms-inmemorydb
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-dao:inmemorydb">
+                        prefix:mappingservice-dao-inmemorydb
                     </type>
-                    <name>lfm-ms-inmemorydb-default</name>
+                    <name>mappingservice-dao-inmemorydb-default</name>
                     <record-timeout>240</record-timeout>
                 </module>
             </modules>
             <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
               <service>
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:ms:dao">prefix:ms-dao</type>
+                <type xmlns:dao="urn:opendaylight:lfm:mappingservice-dao">dao:mappingservice-dao</type>
                 <instance>
-                  <name>lfm-ms-inmemorydb</name>
-                  <provider>/modules/module[type='lfm-ms-inmemorydb'][name='lfm-ms-inmemorydb-default']
+                  <name>mappingservice-dao-inmemorydb</name>
+                  <provider>/modules/module[type='mappingservice-dao-inmemorydb'][name='mappingservice-dao-inmemorydb-default']
                   </provider>
                 </instance>
               </service>
             </services>
         </data>
     </configuration>
-</snapshot>
\ No newline at end of file
+</snapshot>
@@ -1,13 +1,13 @@
-package org.opendaylight.controller.config.yang.config.lfm.ms.dao.inmemorydb;
+package org.opendaylight.controller.config.yang.config.lfm.mappingservice_dao.inmemorydb;
 
 import org.opendaylight.lispflowmapping.inmemorydb.HashMapDb;
 
-public class InMemoryDbModule extends org.opendaylight.controller.config.yang.config.lfm.ms.dao.inmemorydb.AbstractInMemoryDbModule {
+public class InMemoryDbModule extends org.opendaylight.controller.config.yang.config.lfm.mappingservice_dao.inmemorydb.AbstractInMemoryDbModule {
     public InMemoryDbModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public InMemoryDbModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.lfm.ms.dao.inmemorydb.InMemoryDbModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public InMemoryDbModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.lfm.mappingservice_dao.inmemorydb.InMemoryDbModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
@@ -22,4 +22,5 @@ public class InMemoryDbModule extends org.opendaylight.controller.config.yang.co
         hashMapDb.setRecordTimeOut(getRecordTimeout());
         return hashMapDb;
     }
+
 }
diff --git a/mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice_dao/inmemorydb/InMemoryDbModuleFactory.java b/mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/mappingservice_dao/inmemorydb/InMemoryDbModuleFactory.java
new file mode 100644 (file)
index 0000000..22b9b64
--- /dev/null
@@ -0,0 +1,13 @@
+/*
+* Generated file
+*
+* Generated from: yang module name: mappingservice-dao-inmemorydb yang module local name: mappingservice-dao-inmemorydb
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Wed Oct 07 00:21:06 EEST 2015
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.controller.config.yang.config.lfm.mappingservice_dao.inmemorydb;
+public class InMemoryDbModuleFactory extends org.opendaylight.controller.config.yang.config.lfm.mappingservice_dao.inmemorydb.AbstractInMemoryDbModuleFactory {
+
+}
diff --git a/mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/ms/dao/inmemorydb/InMemoryDbModuleFactory.java b/mappingservice/inmemorydb/src/main/java/org/opendaylight/controller/config/yang/config/lfm/ms/dao/inmemorydb/InMemoryDbModuleFactory.java
deleted file mode 100644 (file)
index 0a82ca8..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: lfm-ms-inmemorydb yang module local name: lfm-ms-inmemorydb
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Jul 13 12:44:05 CEST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.config.lfm.ms.dao.inmemorydb;
-public class InMemoryDbModuleFactory extends org.opendaylight.controller.config.yang.config.lfm.ms.dao.inmemorydb.AbstractInMemoryDbModuleFactory {
-
-}
diff --git a/mappingservice/inmemorydb/src/main/yang/lfm-ms-inmemorydb.yang b/mappingservice/inmemorydb/src/main/yang/lfm-ms-inmemorydb.yang
deleted file mode 100644 (file)
index e33d050..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-module lfm-ms-inmemorydb {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:lfm:ms:dao:inmemorydb";
-    prefix "inmemorydb";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import lfm-ms-dao { prefix ms-dao; revision-date 2015-07-13; }
-
-    description
-        "Service definition for Mapping Service DAO.";
-
-    revision "2015-07-13" {
-        description
-            "Initial revision";
-    }
-
-    identity lfm-ms-inmemorydb {
-        base config:module-type;
-        config:provided-service ms-dao:ms-dao;
-        config:java-name-prefix InMemoryDb;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case lfm-ms-inmemorydb {
-          when "/config:modules/config:module/config:type = 'lfm-ms-inmemorydb'";
-          leaf record-timeout {
-              type uint16;
-              description
-                  "Mapping record timeout";
-          }
-        }
-    }
-}
\ No newline at end of file
diff --git a/mappingservice/inmemorydb/src/main/yang/mappingservice-dao-inmemorydb.yang b/mappingservice/inmemorydb/src/main/yang/mappingservice-dao-inmemorydb.yang
new file mode 100644 (file)
index 0000000..c54c548
--- /dev/null
@@ -0,0 +1,33 @@
+module mappingservice-dao-inmemorydb {
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-dao:inmemorydb";
+    prefix "inmemorydb";
+
+    import config { prefix config; revision-date 2013-04-05; }
+    import mappingservice-dao { prefix ms-dao; revision-date 2015-10-07; }
+
+    description
+        "InMemoryDb Mapping Service DAO implementation.";
+
+    revision "2015-10-07" {
+        description
+            "Module renamed from lfm-ms-inmemorydb";
+    }
+
+    identity mappingservice-dao-inmemorydb {
+        base config:module-type;
+        config:provided-service ms-dao:mappingservice-dao;
+        config:java-name-prefix InMemoryDb;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case mappingservice-dao-inmemorydb {
+          when "/config:modules/config:module/config:type = 'mappingservice-dao-inmemorydb'";
+          leaf record-timeout {
+              type uint16;
+              description
+                  "Mapping record timeout";
+          }
+        }
+    }
+}