Renamed pcep parser stateful & initiated extensions.

Change-Id: I83f4ac3054e13905a1831295baae8cd8b2094175
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/pcep/controller-config/src/main/resources/initial/32-pcep.xml b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
index 0e89c46826ed4ac583d5dd98f9ac5ba798b199af..7db50724033e8b09c395074e0042621916ba5f17 100644 (file)
--- a/pcep/controller-config/src/main/resources/initial/32-pcep.xml
+++ b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
@@ -23,11 +23,11 @@
                                        </extension>
                                        <extension>
                                                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
-                                               <name>pcep-parser-stateful</name>
+                                               <name>pcep-parser-ietf-stateful07</name>
                                        </extension>
                                        <extension>
                                                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
-                                               <name>pcep-parser-crabbe-initiated</name>
+                                               <name>pcep-parser-ietf-initiated00</name>
                                        </extension>
                                </module>
                                <module>
@@ -35,12 +35,12 @@
                                        <name>pcep-parser-base</name>
                                </module>
                                <module>
-                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-stateful</type>
-                                       <name>pcep-parser-stateful</name>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-ietf-stateful07</type>
+                                       <name>pcep-parser-ietf-stateful07</name>
                                </module>
                                <module>
-                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-crabbe-initiated</type>
-                                       <name>pcep-parser-crabbe-initiated</name>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-ietf-initiated00</type>
+                                       <name>pcep-parser-ietf-initiated00</name>
                                </module>
                                <module>
                                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-session-proposal-factory-impl</type>
@@ -108,12 +108,12 @@
                                                <provider>/config/modules/module[name='pcep-parser-base']/instance[name='pcep-parser-base']</provider>
                                        </instance>
                                        <instance>
-                                               <name>pcep-parser-crabbe-initiated</name>
-                                               <provider>/config/modules/module[name='pcep-parser-crabbe-initiated']/instance[name='pcep-parser-crabbe-initiated']</provider>
+                                               <name>pcep-parser-ietf-initiated00</name>
+                                               <provider>/config/modules/module[name='pcep-parser-ietf-initiated00']/instance[name='pcep-parser-ietf-initiated00']</provider>
                                        </instance>
                                        <instance>
-                                               <name>pcep-parser-stateful</name>
-                                               <provider>/config/modules/module[name='pcep-parser-stateful']/instance[name='pcep-parser-stateful']</provider>
+                                               <name>pcep-parser-ietf-stateful07</name>
+                                               <provider>/config/modules/module[name='pcep-parser-ietf-stateful07']/instance[name='pcep-parser-ietf-stateful07']</provider>
                                        </instance>
                                </service>
                                <service>

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModuleFactory.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModuleFactory.java
deleted file mode 100644 (file)
index 63a056b..0000000
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModuleFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  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
- */
-/**
-* Generated file
-
-* Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-crabbe-initiated
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Tue Dec 03 09:34:06 CET 2013
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.pcep.impl;
-
-/**
-*
-*/
-public class CrabbeInitiatedPCEPParserModuleFactory extends org.opendaylight.controller.config.yang.pcep.impl.AbstractCrabbeInitiatedPCEPParserModuleFactory
-{
-
-
-}

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModule.java
similarity index 53%
rename from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModule.java
rename to pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModule.java
index e7fde11e655bfd961c8bf8228bd79a00a033fc4d..3a999aa7ed204006ffc9412763595eb69d6fc9cb 100644 (file)
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModule.java
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  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,
@@ -8,9 +8,9 @@
 /**
  * Generated file
 
- * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-crabbe-initiated
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-initiated00
  * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
- * Generated at: Tue Dec 03 09:34:06 CET 2013
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
  *
  * Do not modify this file unless it is present under src/main directory
  */
@@ -19,17 +19,19 @@ package org.opendaylight.controller.config.yang.pcep.impl;
 import org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator;
 
 /**
- *
- */
-public final class CrabbeInitiatedPCEPParserModule extends org.opendaylight.controller.config.yang.pcep.impl.AbstractCrabbeInitiatedPCEPParserModule
-{
+*
+*/
+public final class IetfInitiated00PCEPParserModule extends
+               org.opendaylight.controller.config.yang.pcep.impl.AbstractIetfInitiated00PCEPParserModule {
 
-       public CrabbeInitiatedPCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+       public IetfInitiated00PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                       final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
                super(identifier, dependencyResolver);
        }
 
-       public CrabbeInitiatedPCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                       final CrabbeInitiatedPCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
+       public IetfInitiated00PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                       final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+                       final IetfInitiated00PCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
 
                super(identifier, dependencyResolver, oldModule, oldInstance);
        }

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModuleFactory.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..8b1c592
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModuleFactory.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  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
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-initiated00
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+/**
+*
+*/
+public class IetfInitiated00PCEPParserModuleFactory extends
+               org.opendaylight.controller.config.yang.pcep.impl.AbstractIetfInitiated00PCEPParserModuleFactory {
+
+}

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/StatefulPCEPParserModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModule.java
similarity index 64%
rename from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/StatefulPCEPParserModule.java
rename to pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModule.java
index a929199103724ecb592efaf169cd0aa7a9893fba..ee1fb694e41b3f0b46aacf6d4af7ec0da22cf998 100644 (file)
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/StatefulPCEPParserModule.java
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModule.java
@@ -8,9 +8,9 @@
 /**
  * Generated file
 
- * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-stateful
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-stateful07
  * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
- * Generated at: Tue Jan 14 11:25:06 CET 2014
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
  *
  * Do not modify this file unless it is present under src/main directory
  */
@@ -19,18 +19,19 @@ package org.opendaylight.controller.config.yang.pcep.impl;
 import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
 
 /**
- *
- */
-public final class StatefulPCEPParserModule extends org.opendaylight.controller.config.yang.pcep.impl.AbstractStatefulPCEPParserModule {
+*
+*/
+public final class IetfStateful07PCEPParserModule extends
+               org.opendaylight.controller.config.yang.pcep.impl.AbstractIetfStateful07PCEPParserModule {
 
-       public StatefulPCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+       public IetfStateful07PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
                        final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
                super(identifier, dependencyResolver);
        }
 
-       public StatefulPCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                       final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final StatefulPCEPParserModule oldModule,
-                       final java.lang.AutoCloseable oldInstance) {
+       public IetfStateful07PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                       final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+                       final IetfStateful07PCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
 
                super(identifier, dependencyResolver, oldModule, oldInstance);
        }

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/StatefulPCEPParserModuleFactory.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModuleFactory.java
similarity index 71%
rename from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/StatefulPCEPParserModuleFactory.java
rename to pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModuleFactory.java
index 2acbd802219dabdac65348793ada9956fab2ae13..3faf57eb0cafd293c5bb2c43b04527fca33e5c50 100644 (file)
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/StatefulPCEPParserModuleFactory.java
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModuleFactory.java
@@ -8,9 +8,9 @@
 /**
  * Generated file
 
- * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-stateful
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-stateful07
  * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
- * Generated at: Tue Jan 14 11:25:06 CET 2014
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
  *
  * Do not modify this file unless it is present under src/main directory
  */
@@ -19,7 +19,7 @@ package org.opendaylight.controller.config.yang.pcep.impl;
 /**
 *
 */
-public class StatefulPCEPParserModuleFactory extends
-               org.opendaylight.controller.config.yang.pcep.impl.AbstractStatefulPCEPParserModuleFactory {
+public class IetfStateful07PCEPParserModuleFactory extends
+               org.opendaylight.controller.config.yang.pcep.impl.AbstractIetfStateful07PCEPParserModuleFactory {
 
 }

diff --git a/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang b/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang
index 726b3cd0cbf9aa1351008f6e7d33f53a6d9f65f9..489842019eb65ced90d72f73ecbc5b997d7eb51f 100644 (file)
--- a/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang
+++ b/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang
@@ -46,27 +46,27 @@ module odl-pcep-impl-cfg {
         }
     }
 
-    identity pcep-parser-stateful {
+    identity pcep-parser-ietf-stateful07 {
         base config:module-type;
         config:provided-service spi:extension;
-        config:java-name-prefix StatefulPCEPParser;
+        config:java-name-prefix IetfStateful07PCEPParser;
     }
 
     augment "/config:modules/config:module/config:configuration" {
-        case pcep-parser-stateful {
-            when "/config:modules/config:module/config:type = 'pcep-parser-stateful'";
+        case pcep-parser-ietf-stateful07 {
+            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-stateful07'";
         }
     }
 
-       identity pcep-parser-crabbe-initiated {
+       identity pcep-parser-ietf-initiated00 {
                base config:module-type;
         config:provided-service spi:extension;
-        config:java-name-prefix CrabbeInitiatedPCEPParser;
+        config:java-name-prefix IetfInitiated00PCEPParser;
     }
 
     augment "/config:modules/config:module/config:configuration" {
-        case pcep-parser-crabbe-initiated {
-            when "/config:modules/config:module/config:type = 'pcep-parser-crabbe-initiated'";
+        case pcep-parser-ietf-initiated00 {
+            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-initiated00'";
         }
     }