Convert dsbenchmark to blueprint

Change-Id: I14516ea469ec23aff17bc3d565f859b9edb99d2d
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml
index c77deb60c0996b482c677b93d396ebf12ffcff6e..0b3f02303760bb8465933b670b0fd86f5ea47315 100644 (file)
--- a/benchmark/dsbenchmark/pom.xml
+++ b/benchmark/dsbenchmark/pom.xml
@@ -9,10 +9,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/config/config-parent/pom.xml</relativePath>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -20,12 +20,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <artifactId>dsbenchmark</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>benchmark-api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>

diff --git a/benchmark/dsbenchmark/src/main/config/default-config.xml b/benchmark/dsbenchmark/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 7fc1b6b..0000000
--- a/benchmark/dsbenchmark/src/main/config/default-config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2015 Cisco Systems 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
--->
-<snapshot>
-  <required-capabilities>
-    <capability>urn:opendaylight:params:xml:ns:yang:dsbenchmark:impl?module=dsbenchmark-impl&amp;revision=2014-12-10</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>
-
-    <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:dsbenchmark:impl">prefix:dsbenchmark-impl</type>
-          <name>dsbenchmark-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>
-          <dom-data-broker>
-            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-            <name>pingpong-broker</name>
-          </dom-data-broker>
-          <binding-data-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-            <name>pingpong-binding-data-broker</name>
-          </binding-data-broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java
index 8af7e15b9775c6af18fd7872f372effe55b00a1c..467f35cf60bac07bec384ae86d2afd8299ba687c 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java
@@ -7,18 +7,15 @@
  */
 package org.opendaylight.dsbenchmark;
 
+import com.google.common.util.concurrent.Futures;
 import java.util.Collections;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicReference;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 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.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.dsbenchmark.listener.DsbenchmarkListenerProvider;
 import org.opendaylight.dsbenchmark.simpletx.SimpletxBaDelete;
 import org.opendaylight.dsbenchmark.simpletx.SimpletxBaRead;
@@ -48,9 +45,7 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.util.concurrent.Futures;
-
-public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkService, AutoCloseable {
+public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(DsbenchmarkProvider.class);
     private static final InstanceIdentifier<TestExec> TEST_EXEC_IID =
@@ -61,35 +56,30 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
     private final AtomicReference<ExecStatus> execStatus = new AtomicReference<>(ExecStatus.Idle);
     private final DsbenchmarkListenerProvider listenerProvider = new DsbenchmarkListenerProvider();
     private final DOMDataBroker domDataBroker;  // Async DOM Broker for use with all DOM operations
-    private final DataBroker bindingDataBroker; // Async Binding-Aware Broker for use in tx chains; initialized to
+    private final DataBroker txChainDataBroker; // Async Binding-Aware Broker for use in tx chains; initialized to
                                                 // ping-pong broker in default config (see default-config.xml and
                                                 // dsbenchmark-impl.yang)
-    private DataBroker dataBroker;              // "Legacy" OSGI Data Broker for use in simple transactions
-    private RpcRegistration<DsbenchmarkService> dstReg;
+    private final DataBroker simpleTxDataBroker;      // "Legacy" OSGI Data Broker for use in simple transactions
 
     private long testsCompleted = 0;
 
-    public DsbenchmarkProvider(final DOMDataBroker domDataBroker, final DataBroker bindingDataBroker) {
-        // We have to get the DOMDataBroker via the constructor,
-        // since we can't get it from the session
+    public DsbenchmarkProvider(final DOMDataBroker domDataBroker, final DataBroker txChainDataBroker,
+            final DataBroker simpleTxDataBroker) {
         this.domDataBroker = domDataBroker;
-        this.bindingDataBroker = bindingDataBroker;
+        this.txChainDataBroker = txChainDataBroker;
+        this.simpleTxDataBroker = simpleTxDataBroker;
     }
 
-    @Override
-    public void onSessionInitiated(final ProviderContext session) {
-        this.dataBroker = session.getSALService(DataBroker.class);
-        this.dstReg = session.addRpcImplementation( DsbenchmarkService.class, this );
-        listenerProvider.setDataBroker(dataBroker);
+    public void init() {
+        listenerProvider.setDataBroker(simpleTxDataBroker);
         setTestOperData(this.execStatus.get(), testsCompleted);
 
-        LOG.debug("DsbenchmarkProvider Session Initiated");
+        LOG.info("DsbenchmarkProvider initiated");
     }
 
     @Override
-    public void close() throws Exception {
-        dstReg.close();
-        LOG.debug("DsbenchmarkProvider Closed");
+    public void close() {
+        LOG.info("DsbenchmarkProvider closed");
     }
 
     @Override
@@ -171,7 +161,7 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
                 .setTestsCompleted(tstCompl)
                 .build();
 
-        WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+        WriteTransaction tx = simpleTxDataBroker.newWriteOnlyTransaction();
         tx.put(LogicalDatastoreType.OPERATIONAL, TEST_STATUS_IID, status);
 
         try {
@@ -188,7 +178,7 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
                 .setOuterList(Collections.<OuterList>emptyList())
                 .build();
 
-        WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+        WriteTransaction tx = simpleTxDataBroker.newWriteOnlyTransaction();
         tx.put(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID, data);
         try {
             tx.submit().checkedGet();
@@ -198,7 +188,7 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
             throw new IllegalStateException(e);
         }
 
-        tx = dataBroker.newWriteOnlyTransaction();
+        tx = simpleTxDataBroker.newWriteOnlyTransaction();
         tx.put(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID, data);
         try {
             tx.submit().checkedGet();
@@ -226,13 +216,13 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
             if (txType == StartTestInput.TransactionType.SIMPLETX) {
                 if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
                     if (StartTestInput.Operation.DELETE == oper) {
-                        retVal = new SimpletxBaDelete(this.dataBroker, outerListElem,
+                        retVal = new SimpletxBaDelete(this.simpleTxDataBroker, outerListElem,
                                 innerListElem,writesPerTx, dataStore);
                     } else if (StartTestInput.Operation.READ == oper) {
-                        retVal = new SimpletxBaRead(this.dataBroker, outerListElem,
+                        retVal = new SimpletxBaRead(this.simpleTxDataBroker, outerListElem,
                                 innerListElem, writesPerTx, dataStore);
                     } else {
-                        retVal = new SimpletxBaWrite(this.dataBroker, oper, outerListElem,
+                        retVal = new SimpletxBaWrite(this.simpleTxDataBroker, oper, outerListElem,
                                 innerListElem, writesPerTx, dataStore);
                     }
                 } else {
@@ -250,13 +240,13 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
             } else {
                 if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
                     if (StartTestInput.Operation.DELETE == oper) {
-                        retVal = new TxchainBaDelete(this.bindingDataBroker, outerListElem,
+                        retVal = new TxchainBaDelete(this.txChainDataBroker, outerListElem,
                                 innerListElem, writesPerTx, dataStore);
                     } else if (StartTestInput.Operation.READ == oper) {
-                        retVal = new TxchainBaRead(this.bindingDataBroker,outerListElem,
+                        retVal = new TxchainBaRead(this.txChainDataBroker,outerListElem,
                                 innerListElem,writesPerTx, dataStore);
                     } else {
-                        retVal = new TxchainBaWrite(this.bindingDataBroker, oper, outerListElem,
+                        retVal = new TxchainBaWrite(this.txChainDataBroker, oper, outerListElem,
                                 innerListElem, writesPerTx, dataStore);
                     }
                 } else {

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dsbenchmark/impl/rev141210/DsbenchmarkImplModule.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dsbenchmark/impl/rev141210/DsbenchmarkImplModule.java
deleted file mode 100644 (file)
index 2a38b6e..0000000
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dsbenchmark/impl/rev141210/DsbenchmarkImplModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems 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
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.impl.rev141210;
-
-import org.opendaylight.dsbenchmark.DsbenchmarkProvider;
-
-public class DsbenchmarkImplModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.impl.rev141210.AbstractDsbenchmarkImplModule {
-    public DsbenchmarkImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DsbenchmarkImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.impl.rev141210.DsbenchmarkImplModule oldModule, final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        DsbenchmarkProvider provider = new DsbenchmarkProvider(getDomDataBrokerDependency(),
-                                                               getBindingDataBrokerDependency());
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-    }
-
-}

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dsbenchmark/impl/rev141210/DsbenchmarkImplModuleFactory.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dsbenchmark/impl/rev141210/DsbenchmarkImplModuleFactory.java
deleted file mode 100644 (file)
index f3a89a0..0000000
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dsbenchmark/impl/rev141210/DsbenchmarkImplModuleFactory.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems 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: dsbenchmark yang module local name: dsbenchmark
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Jan 02 13:49:24 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.impl.rev141210;
-public class DsbenchmarkImplModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.impl.rev141210.AbstractDsbenchmarkImplModuleFactory {
-
-}

diff --git a/benchmark/dsbenchmark/src/main/resources/org/opendaylight/blueprint/dsbenchmark.xml b/benchmark/dsbenchmark/src/main/resources/org/opendaylight/blueprint/dsbenchmark.xml
new file mode 100644 (file)
index 0000000..3f7e0cf
--- /dev/null
+++ b/benchmark/dsbenchmark/src/main/resources/org/opendaylight/blueprint/dsbenchmark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Inocybe Technologies 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
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+  <reference id="domDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker" odl:type="pingpong"/>
+  <reference id="txChainDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" odl:type="pingpong"/>
+  <reference id="simpleTxDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
+
+  <bean id="provider" class="org.opendaylight.dsbenchmark.DsbenchmarkProvider"
+          init-method="init" destroy-method="close">
+    <argument ref="domDataBroker"/>
+    <argument ref="txChainDataBroker"/>
+    <argument ref="simpleTxDataBroker"/>
+  </bean>
+
+  <odl:rpc-implementation ref="provider"/>
+</blueprint>

diff --git a/benchmark/dsbenchmark/src/main/yang/dsbenchmark-impl.yang b/benchmark/dsbenchmark/src/main/yang/dsbenchmark-impl.yang
deleted file mode 100644 (file)
index d7053c1..0000000
--- a/benchmark/dsbenchmark/src/main/yang/dsbenchmark-impl.yang
+++ /dev/null
@@ -1,52 +0,0 @@
-module dsbenchmark-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:dsbenchmark:impl";
-    prefix "dsbenchmark-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-    import opendaylight-md-sal-dom { prefix md-sal-dom; revision-date 2013-10-28;}
-
-    description
-        "Service definition for dsbenchmark project";
-
-    revision "2014-12-10" {
-        description
-            "Initial revision";
-    }
-
-    identity dsbenchmark-impl {
-        base config:module-type;
-        config:java-name-prefix DsbenchmarkImpl;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case dsbenchmark-impl {
-            when "/config:modules/config:module/config:type = 'dsbenchmark-impl'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-            container dom-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-dom:dom-async-data-broker;
-                    }
-                }
-            }
-            container binding-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml
index b941735b8b22e03dc9c35a86cb1088e8bc800f3b..dea279b584aa28ce508567c6a48719cc6b6cd577 100644 (file)
--- a/features/benchmark/features-mdsal-benchmark/pom.xml
+++ b/features/benchmark/features-mdsal-benchmark/pom.xml
@@ -63,13 +63,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>dsbenchmark</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>dsbenchmark</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ntfbenchmark</artifactId>

diff --git a/features/benchmark/features-mdsal-benchmark/src/main/features/features.xml b/features/benchmark/features-mdsal-benchmark/src/main/features/features.xml
index c2626f5669911d3d0de9220b9dce4b9967fe967a..9e5e5c89545934a54947714d8a768d374a121f36 100644 (file)
--- a/features/benchmark/features-mdsal-benchmark/src/main/features/features.xml
+++ b/features/benchmark/features-mdsal-benchmark/src/main/features/features.xml
@@ -22,7 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version='${project.version}'>odl-benchmark-api</feature>
     <bundle>mvn:org.opendaylight.controller/dsbenchmark/{{VERSION}}</bundle>
-    <configfile finalname="dsbenchmark-impl-default-config.xml">mvn:org.opendaylight.controller/dsbenchmark/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-ntfbenchmark' version='${project.version}' description='OpenDaylight :: ntfbenchmark :: '>
     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
@@ -31,14 +30,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <configfile finalname="ntfbenchmark-impl-default-config.xml">mvn:org.opendaylight.controller/ntfbenchmark/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-mdsal-benchmark' version='${project.version}' description='OpenDaylight :: dsbenchmark :: '>
-    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-benchmark-api</feature>
-    <bundle>mvn:org.opendaylight.controller/benchmark-api/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.controller/dsbenchmark/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.controller/ntfbenchmark/{{VERSION}}</bundle>
+    <feature version='${project.version}'>odl-dsbenchmark</feature>
+    <feature version='${project.version}'>odl-ntfbenchmark</feature>
     <bundle>mvn:org.opendaylight.controller/rpcbenchmark/{{VERSION}}</bundle>
-    <configfile finalname="dsbenchmark-impl-default-config.xml">mvn:org.opendaylight.controller/dsbenchmark/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="ntfbenchmark-impl-default-config.xml">mvn:org.opendaylight.controller/ntfbenchmark/{{VERSION}}/xml/config</configfile>
     <configfile finalname="rpcbenchmark-impl-default-config.xml">mvn:org.opendaylight.controller/rpcbenchmark/{{VERSION}}/xml/config</configfile>
   </feature>
 </features>

diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml
index d4ca5c8f64c2fefd263f4e8f8806dfcbf80fa87f..f23997802b2b8f73cc891cb512841ffcf710d562 100644 (file)
--- a/features/benchmark/odl-dsbenchmark/pom.xml
+++ b/features/benchmark/odl-dsbenchmark/pom.xml
@@ -45,13 +45,5 @@
             <artifactId>dsbenchmark</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <!-- finalname="dsbenchmark-impl-default-config.xml" -->
-            <groupId>${project.groupId}</groupId>
-            <artifactId>dsbenchmark</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/benchmark/odl-dsbenchmark/src/main/feature/feature.xml b/features/benchmark/odl-dsbenchmark/src/main/feature/feature.xml
deleted file mode 100644 (file)
index fc4cb01..0000000
--- a/features/benchmark/odl-dsbenchmark/src/main/feature/feature.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- 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
- -->
-<features name="odl-dsbenchmark-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name='odl-dsbenchmark' version='${project.version}' description='OpenDaylight :: dsbenchmark :: '>
-        <configfile finalname="dsbenchmark-impl-default-config.xml">
-            mvn:org.opendaylight.controller/dsbenchmark/${project.version}/xml/config
-        </configfile>
-    </feature>
-</features>

diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml
index 6741a45aac3849f0d957cb83464a42718a187be4..22ad6301c83d721a1c224c8995872e84a69d7a60 100644 (file)
--- a/features/benchmark/odl-mdsal-benchmark/pom.xml
+++ b/features/benchmark/odl-mdsal-benchmark/pom.xml
@@ -60,14 +60,6 @@
             <artifactId>rpcbenchmark</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <!-- finalname="dsbenchmark-impl-default-config.xml" -->
-            <groupId>${project.groupId}</groupId>
-            <artifactId>dsbenchmark</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
         <dependency>
             <!-- finalname="ntfbenchmark-impl-default-config.xml" -->
             <groupId>${project.groupId}</groupId>
@@ -85,4 +77,4 @@
             <classifier>config</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/benchmark/odl-mdsal-benchmark/src/main/feature/feature.xml b/features/benchmark/odl-mdsal-benchmark/src/main/feature/feature.xml
index 08b0dc0faab24899072dfac60faae5d6913d1368..36d134267b49b47597561d1c0fe40ddf08f81523 100644 (file)
--- a/features/benchmark/odl-mdsal-benchmark/src/main/feature/feature.xml
+++ b/features/benchmark/odl-mdsal-benchmark/src/main/feature/feature.xml
@@ -8,9 +8,6 @@
  -->
 <features name="odl-dsbenchmark-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-mdsal-benchmark" version="${project.version}">
-        <configfile finalname="dsbenchmark-impl-default-config.xml">
-            mvn:org.opendaylight.controller/dsbenchmark/${project.version}/xml/config
-        </configfile>
         <configfile finalname="ntfbenchmark-impl-default-config.xml">
             mvn:org.opendaylight.controller/ntfbenchmark/${project.version}/xml/config
         </configfile>