summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-08-15 09:46:03 -0400
committerDan Timoney <dtimoney@att.com>2017-08-15 09:46:03 -0400
commit514aff35f5c8727ee0c0b75b2299e8e7d27b4102 (patch)
tree1f1bb92f3d71a41875b7c13eaf99cd3e742ec85d
parentbfaacc8a077daa48fb85e66a80e8f2904fce59a0 (diff)
Refactor dataChange
Update dataChange to replace references to openECOMP with references to ONAP Change-Id: I2d495dbc13e6dd38e0c975070969b07e796eb82f Issue-ID: CCSDK-25 Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r--dataChange/features/src/main/resources/features.xml8
-rwxr-xr-xdataChange/installer/pom.xml2
-rwxr-xr-xdataChange/model/src/main/yang/DataChange.yang2
-rw-r--r--dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeClient.java (renamed from dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeClient.java)4
-rw-r--r--dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java (renamed from dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeProvider.java)12
-rw-r--r--dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/datachange/provider/impl/rev140523/DataChangeProviderModule.java (renamed from dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModule.java)22
-rw-r--r--dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java (renamed from dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java)6
-rw-r--r--dataChange/provider/src/main/resources/initial/dataChange-provider.xml6
-rwxr-xr-xdataChange/provider/src/main/yang/DataChange-provider-impl.yang2
9 files changed, 24 insertions, 40 deletions
diff --git a/dataChange/features/src/main/resources/features.xml b/dataChange/features/src/main/resources/features.xml
index 2b4ac946..9cc8cc57 100644
--- a/dataChange/features/src/main/resources/features.xml
+++ b/dataChange/features/src/main/resources/features.xml
@@ -9,9 +9,7 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
http://www.apache.org/licenses/LICENSE-2.0
-
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,9 +29,9 @@
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
<feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
<feature version="${sdnctl.sli.version}">sdnc-sli</feature>
- <bundle>mvn:org.openecomp.sdnc.northbound/dataChange-model/${project.version}</bundle>
- <bundle>mvn:org.openecomp.sdnc.northbound/dataChange-provider/${project.version}</bundle>
- <configfile finalname="etc/opendaylight/karaf/200-dataChange-provider.xml">mvn:org.openecomp.sdnc.northbound/dataChange-provider/${project.version}/xml/config</configfile>
+ <bundle>mvn:org.onap.ccsdk.sli.northbound/dataChange-model/${project.version}</bundle>
+ <bundle>mvn:org.onap.ccsdk.sli.northbound/dataChange-provider/${project.version}</bundle>
+ <configfile finalname="etc/opendaylight/karaf/200-dataChange-provider.xml">mvn:org.onap.ccsdk.sli.northbound/dataChange-provider/${project.version}/xml/config</configfile>
</feature>
</features>
diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml
index 414719e1..63fda23a 100755
--- a/dataChange/installer/pom.xml
+++ b/dataChange/installer/pom.xml
@@ -100,7 +100,7 @@
<useRepositoryLayout>true</useRepositoryLayout>
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
- <includeGroupIds>org.openecomp.sdnc</includeGroupIds>
+ <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
<excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds>
<scope>provided</scope>
</configuration>
diff --git a/dataChange/model/src/main/yang/DataChange.yang b/dataChange/model/src/main/yang/DataChange.yang
index 3d326f7b..8f9a8e6f 100755
--- a/dataChange/model/src/main/yang/DataChange.yang
+++ b/dataChange/model/src/main/yang/DataChange.yang
@@ -2,7 +2,7 @@ module DataChange {
yang-version 1;
- namespace "org:openecomp:sdnc:datachange";
+ namespace "org:onap:ccsdk:sli:northbound:datachange";
prefix datachg;
diff --git a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeClient.java b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeClient.java
index 5db3eff6..81da7416 100644
--- a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeClient.java
+++ b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeClient.java
@@ -19,14 +19,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.datachange;
+package org.onap.ccsdk.sli.northbound;
import java.util.Properties;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.rev150519.DataChangeNotificationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.rev150519.DataChangeNotificationOutputBuilder;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
diff --git a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeProvider.java b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
index 791da5c0..40d30a79 100644
--- a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeProvider.java
+++ b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.datachange;
+package org.onap.ccsdk.sli.northbound;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
@@ -31,11 +31,11 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.rev150519.DataChangeNotificationInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.rev150519.DataChangeNotificationInputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.rev150519.DataChangeNotificationOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.rev150519.DataChangeNotificationOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.rev150519.DataChangeService;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.rev150519.DataChangeNotificationInput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.rev150519.DataChangeNotificationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.rev150519.DataChangeNotificationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.rev150519.DataChangeNotificationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.rev150519.DataChangeService;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.slf4j.Logger;
diff --git a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModule.java b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/datachange/provider/impl/rev140523/DataChangeProviderModule.java
index c3dd110a..f8267cf3 100644
--- a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModule.java
+++ b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/datachange/provider/impl/rev140523/DataChangeProviderModule.java
@@ -19,16 +19,13 @@
* ============LICENSE_END=========================================================
*/
-package org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.provider.impl.rev140523;
-
-import org.openecomp.sdnc.datachange.DataChangeProvider;
-
-public class DataChangeProviderModule extends org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.provider.impl.rev140523.AbstractDataChangeProviderModule {
+package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.provider.impl.rev140523;
+public class DataChangeProviderModule extends org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.provider.impl.rev140523.AbstractDataChangeProviderModule {
public DataChangeProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
super(identifier, dependencyResolver);
}
- public DataChangeProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.provider.impl.rev140523.DataChangeProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+ public DataChangeProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.provider.impl.rev140523.DataChangeProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
super(identifier, dependencyResolver, oldModule, oldInstance);
}
@@ -39,17 +36,8 @@ public class DataChangeProviderModule extends org.opendaylight.yang.gen.v1.org.o
@Override
public java.lang.AutoCloseable createInstance() {
- final DataChangeProvider provider = new DataChangeProvider(getDataBrokerDependency()
- , getNotificationServiceDependency()
- , getRpcRegistryDependency());
-
- return new AutoCloseable() {
-
- @Override
- public void close() throws Exception {
- provider.close();
- }
- };
+ // TODO:implement
+ throw new java.lang.UnsupportedOperationException();
}
}
diff --git a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java
index 2f472496..5852788c 100644
--- a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java
+++ b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java
@@ -24,11 +24,11 @@
*
* Generated from: yang module name: DataChange-provider-impl yang module local name: DataChange-provider-impl
* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Nov 02 06:00:03 EDT 2016
+* Generated at: Tue Aug 15 09:41:53 EDT 2017
*
* Do not modify this file unless it is present under src/main directory
*/
-package org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.provider.impl.rev140523;
-public class DataChangeProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.sdnc.datachange.provider.impl.rev140523.AbstractDataChangeProviderModuleFactory {
+package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.provider.impl.rev140523;
+public class DataChangeProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.datachange.provider.impl.rev140523.AbstractDataChangeProviderModuleFactory {
}
diff --git a/dataChange/provider/src/main/resources/initial/dataChange-provider.xml b/dataChange/provider/src/main/resources/initial/dataChange-provider.xml
index 2812ca4d..3038201b 100644
--- a/dataChange/provider/src/main/resources/initial/dataChange-provider.xml
+++ b/dataChange/provider/src/main/resources/initial/dataChange-provider.xml
@@ -9,9 +9,7 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
http://www.apache.org/licenses/LICENSE-2.0
-
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +27,7 @@
<!-- This xmlns:prefix should match the namespace in the *-provider-impl.yang file
The prefix: inside type should match the prefix of the yang file. -->
- <type xmlns:prefix="org:openecomp:sdnc:datachange:provider:impl">
+ <type xmlns:prefix="org:onap:ccsdk:sli:northbound:datachange:provider:impl">
prefix:DataChange-provider-impl
</type>
<name>DataChange-provider-impl</name>
@@ -66,7 +64,7 @@
our service can be resolved. Capabilities for dependencies defined above are implied which is
why we do not have define a required capability for the data broker, for example. -->
<required-capabilities>
- <capability>org:openecomp:sdnc:datachange:provider:impl?module=DataChange-provider-impl&amp;revision=2014-05-23</capability>
+ <capability>org:onap:ccsdk:sli:northbound:datachange:provider:impl?module=DataChange-provider-impl&amp;revision=2014-05-23</capability>
</required-capabilities>
</snapshot>
diff --git a/dataChange/provider/src/main/yang/DataChange-provider-impl.yang b/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
index fe1dab23..2913273d 100755
--- a/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
+++ b/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
@@ -1,7 +1,7 @@
module DataChange-provider-impl {
yang-version 1;
- namespace "org:openecomp:sdnc:datachange:provider:impl";
+ namespace "org:onap:ccsdk:sli:northbound:datachange:provider:impl";
prefix "DataChange-provider-impl";
import config { prefix config; revision-date 2013-04-05; }