Add config support for PCEP parser activators

Change-Id: I3cc7004116277ee1403cfa1478a310401932321b
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java
new file mode 100644 (file)
index 0000000..33b03cc
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java
@@ -0,0 +1,42 @@
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-base
+ * 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;
+
+import org.opendaylight.protocol.pcep.impl.Activator;
+import org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator;
+
+/**
+ *
+ */
+public final class BasePCEPParserModule extends org.opendaylight.controller.config.yang.pcep.impl.AbstractBasePCEPParserModule
+{
+
+       public BasePCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+               super(identifier, dependencyResolver);
+       }
+
+       public BasePCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+                       final BasePCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
+
+               super(identifier, dependencyResolver, oldModule, oldInstance);
+       }
+
+       @Override
+       public java.lang.AutoCloseable createInstance() {
+               final PCEPExtensionProviderActivator act = new Activator();
+               act.start(getPcepExtensionsDependency());
+               return new AutoCloseable() {
+                       @Override
+                       public void close() {
+                               act.stop();
+                       }
+               };
+       }
+}

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..b38595f
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java
@@ -0,0 +1,19 @@
+/**
+* Generated file
+
+* Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-base
+* 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 BasePCEPParserModuleFactory extends org.opendaylight.controller.config.yang.pcep.impl.AbstractBasePCEPParserModuleFactory
+{
+
+
+}

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/CrabbeInitiatedPCEPParserModule.java
new file mode 100644 (file)
index 0000000..6f04e40
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModule.java
@@ -0,0 +1,42 @@
+/**
+ * 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;
+
+import org.opendaylight.protocol.pcep.impl.CrabbeInitiatedActivator;
+import org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator;
+
+/**
+ *
+ */
+public final class CrabbeInitiatedPCEPParserModule extends org.opendaylight.controller.config.yang.pcep.impl.AbstractCrabbeInitiatedPCEPParserModule
+{
+
+       public CrabbeInitiatedPCEPParserModule(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) {
+
+               super(identifier, dependencyResolver, oldModule, oldInstance);
+       }
+
+       @Override
+       public java.lang.AutoCloseable createInstance() {
+               final PCEPExtensionProviderActivator act = new CrabbeInitiatedActivator();
+               act.start(getPcepExtensionsDependency());
+               return new AutoCloseable() {
+                       @Override
+                       public void close() {
+                               act.stop();
+                       }
+               };
+       }
+}

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
new file mode 100644 (file)
index 0000000..b557ec6
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiatedPCEPParserModuleFactory.java
@@ -0,0 +1,19 @@
+/**
+* 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/PCEPDispatcherImplModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
index 5aa9b0499a1c7bf8ee0c9dff93954ac5e20643ed..4cc792c75f2fc28992fc34dd4fdc4367076e9a57 100644 (file)
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
@@ -54,7 +54,7 @@ org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPDispatcherImplModu
                                getTimerDependency(), localPrefs, getMaxUnknownMessages());
 
                final PCEPDispatcherImpl instance = new PCEPDispatcherImpl(
-                               getExtensionsDependency().getMessageHandlerRegistry(),
+                               getPcepExtensionsDependency().getMessageHandlerRegistry(),
                                negFactory, getBossGroupDependency(), getWorkerGroupDependency());
                return instance;
        }

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 431fdce78d4563e6122453e2cc62ac32fd7f50ee..d757cbfedac003fe99a8bd428157c3b9c0660a3e 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
@@ -34,6 +34,46 @@ module odl-pcep-impl-cfg {
             "Initial revision";
     }
 
+    identity pcep-parser-base {
+        base config:module-type;
+        config:java-name-prefix BasePCEPParser;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case pcep-parser-base {
+            when "/config:modules/config:module/config:type = 'pcep-parser-base'";
+
+            container pcep-extensions {
+                uses config:service-ref {
+                    refine type {
+                        mandatory true;
+                        config:required-identity spi:extensions;
+                    }
+                }
+            }
+        }
+    }
+
+    identity pcep-parser-crabbe-initiated {
+        base config:module-type;
+        config:java-name-prefix CrabbeInitiatedPCEPParser;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case pcep-parser-crabbe-initiated {
+            when "/config:modules/config:module/config:type = 'pcep-parser-crabbe-initiated'";
+
+            container pcep-extensions {
+                uses config:service-ref {
+                    refine type {
+                        mandatory true;
+                        config:required-identity spi:extensions;
+                    }
+                }
+            }
+        }
+    }
+
     identity pcep-dispatcher-impl {
         base config:module-type;
         config:provided-service pcep:pcep-dispatcher;
@@ -49,7 +89,7 @@ module odl-pcep-impl-cfg {
                 default 5;
             }
 
-            container extensions {
+            container pcep-extensions {
                 uses config:service-ref {
                     refine type {
                         mandatory true;

diff --git a/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java b/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java
index 9d8c6093fbc60ac60cee31a85417a84f47c6472a..73f1b5df74cd924de6ecca72a9f925812bea7ca9 100644 (file)
--- a/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java
+++ b/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java
@@ -164,7 +164,7 @@ public class PCEPDispatcherImplModuleTest extends AbstractConfigTest {
                                threadGroupFactoryImplName, "boss-group", 10));
                mxBean.setWorkerGroup(createThreadGroupInstance(transaction,
                                threadGroupFactoryImplName, "worker-group", 10));
-               mxBean.setExtensions(createExtensionsInstance(transaction,
+               mxBean.setPcepExtensions(createExtensionsInstance(transaction,
                                extensionsImplName, "extensions"));
                mxBean.setTimer(createTimerInstance(transaction, timerFactoryImplName,
                                "timmer1"));