Refactor asdcApi

Refactor asdcApi to replace openecomp references with onap

Change-Id: Ic0d61ca75219a57331ba61908fba942a1c0dce7b
Issue-ID: CCSDK-25
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/asdcApi/features/src/main/resources/features.xml b/asdcApi/features/src/main/resources/features.xml
index e72e0f6..f9aa81a 100644 (file)
--- a/asdcApi/features/src/main/resources/features.xml
+++ b/asdcApi/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,11 +29,11 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
 
-        <bundle>mvn:org.openecomp.sdnc.northbound/asdcApi-model/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.sdnc.northbound/asdcApi-provider/${project.version}</bundle>
+        <bundle>mvn:org.onap.ccsdk.sli.northbound/asdcApi-model/${project.version}</bundle>
+        <bundle>mvn:org.onap.ccsdk.sli.northbound/asdcApi-provider/${project.version}</bundle>
 
         <feature version="${sdnctl.sli.version}">sdnc-sli</feature>
-        <configfile finalname="etc/opendaylight/karaf/200-asdcApi-provider.xml">mvn:org.openecomp.sdnc.northbound/asdcApi-provider/${project.version}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/200-asdcApi-provider.xml">mvn:org.onap.ccsdk.sli.northbound/asdcApi-provider/${project.version}/xml/config</configfile>
     </feature>
 
 </features>

diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index 94008aa..b4f3293 100755 (executable)
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/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/asdcApi/model/src/main/yang/ASDC-API.yang b/asdcApi/model/src/main/yang/ASDC-API.yang
index 401ec7d..00ef452 100755 (executable)
--- a/asdcApi/model/src/main/yang/ASDC-API.yang
+++ b/asdcApi/model/src/main/yang/ASDC-API.yang
@@ -2,7 +2,7 @@
 module ASDC-API {
     yang-version "1";
 
-    namespace "org:openecomp:sdnc";
+    namespace "org:onap:ccsdk";
 
     prefix asdc-api;
 
@@ -17,7 +17,7 @@ module ASDC-API {
         }
 
     organization
-        "OpenECOMP";
+        "ONAP";
 
     contact
         "Dan Timoney";

diff --git a/asdcApi/model/src/main/yang/asdc-api-common.yang b/asdcApi/model/src/main/yang/asdc-api-common.yang
index 126368d..1531b7b 100755 (executable)
--- a/asdcApi/model/src/main/yang/asdc-api-common.yang
+++ b/asdcApi/model/src/main/yang/asdc-api-common.yang
@@ -3,12 +3,12 @@ module asdc-api-common {
     yang-version "1";
 
     // Use same namespace defined for file upload in 15.12
-    namespace "org:openecomp:sdnc:asdcapi:common";
+    namespace "org:onap:ccsdk:sli:northbound:asdcapi:common";
 
     prefix asdcapi;
 
     organization
-        "OpenECOMP";
+        "ONAP";
 
     contact
         "Dan Timoney";

diff --git a/asdcApi/model/src/main/yang/asdc-license-model.yang b/asdcApi/model/src/main/yang/asdc-license-model.yang
index 37ae869..33f3835 100755 (executable)
--- a/asdcApi/model/src/main/yang/asdc-license-model.yang
+++ b/asdcApi/model/src/main/yang/asdc-license-model.yang
@@ -1,8 +1,8 @@
 module asdc-license-model {
 
-    namespace "http://xmlns.openecomp.org/asdc/license-model/1.0";
+    namespace "http://xmlns.onap.org/asdc/license-model/1.0";
     prefix le;
-    organization "openecomp";
+    organization "onap";
     contact "asdc";
     description "schema for both vendor license and VF license models";
     revision 2016-04-27 {

diff --git a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiProvider.java b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
similarity index 90%
rename from asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiProvider.java
rename to asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
index 28e59c8..c6e1921 100644 (file)
--- a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiProvider.java
+++ b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.asdcapi;
+package org.onap.ccsdk.sli.northbound.asdcapi;
 
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
@@ -35,21 +35,21 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile
 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.http.xmlns.openecomp.org.asdc.license.model._1._0.rev160427.vf.license.model.grouping.VfLicenseModel;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.ASDCAPIService;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.Artifacts;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.ArtifactsBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelUpdateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelUpdateInputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelUpdateOutput;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelUpdateOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelVersions;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelVersionsBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.artifacts.Artifact;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.artifacts.ArtifactBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.artifacts.ArtifactKey;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.vf.license.model.versions.VfLicenseModelVersion;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.vf.license.model.versions.VfLicenseModelVersionBuilder;
+import org.opendaylight.yang.gen.v1.http.xmlns.onap.org.asdc.license.model._1._0.rev160427.vf.license.model.grouping.VfLicenseModel;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.ASDCAPIService;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.Artifacts;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.ArtifactsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelUpdateInput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelUpdateInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelUpdateOutput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelUpdateOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelVersions;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelVersionsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.artifacts.Artifact;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.artifacts.ArtifactBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.artifacts.ArtifactKey;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.vf.license.model.versions.VfLicenseModelVersion;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.vf.license.model.versions.VfLicenseModelVersionBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;

diff --git a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiSliClient.java b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiSliClient.java
similarity index 98%
rename from asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiSliClient.java
rename to asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiSliClient.java
index 2f3a783..0fa90ea 100644 (file)
--- a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiSliClient.java
+++ b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiSliClient.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.asdcapi;
+package org.onap.ccsdk.sli.northbound.asdcapi;
 
 import java.util.Properties;
 

diff --git a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiUtil.java b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiUtil.java
similarity index 73%
rename from asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiUtil.java
rename to asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiUtil.java
index 240c939..6498f13 100644 (file)
--- a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiUtil.java
+++ b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiUtil.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.asdcapi;
+package org.onap.ccsdk.sli.northbound.asdcapi;
 
 import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.ArtifactsBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelUpdateInput;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelUpdateInputBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.VfLicenseModelVersionsBuilder;
-import org.opendaylight.yang.gen.v1.org.openecomp.sdnc.rev170201.vf.license.model.versions.VfLicenseModelVersionBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.ArtifactsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelUpdateInput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelUpdateInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.VfLicenseModelVersionsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.vf.license.model.versions.VfLicenseModelVersionBuilder;
 
 public class AsdcApiUtil extends MdsalHelper {
 

diff --git a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
similarity index 70%
rename from asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
rename to asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
index c9223a1..0a2272d 100644 (file)
--- a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
+++ b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
@@ -19,16 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opendaylight.yang.gen.v1.org.openecomp.sdnc.asdcapi.provider.impl.rev140523;
-
-import org.openecomp.sdnc.asdcapi.AsdcApiProvider;
-
-public class AsdcApiProviderModule extends org.opendaylight.yang.gen.v1.org.openecomp.sdnc.asdcapi.provider.impl.rev140523.AbstractAsdcApiProviderModule {
+package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.asdcapi.provider.impl.rev140523;
+public class AsdcApiProviderModule extends org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.asdcapi.provider.impl.rev140523.AbstractAsdcApiProviderModule {
     public AsdcApiProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public AsdcApiProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.sdnc.asdcapi.provider.impl.rev140523.AsdcApiProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public AsdcApiProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.asdcapi.provider.impl.rev140523.AsdcApiProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
@@ -39,19 +36,8 @@ public class AsdcApiProviderModule extends org.opendaylight.yang.gen.v1.org.open
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-
-        final AsdcApiProvider provider = new AsdcApiProvider(getDataBrokerDependency()
-                , getNotificationServiceDependency()
-                , getRpcRegistryDependency());
-
-        return new AutoCloseable() {
-
-           @Override
-           public void close() throws Exception {
-
-               provider.close();
-           }
-       };
+        // TODO:implement
+        throw new java.lang.UnsupportedOperationException();
     }
 
 }

diff --git a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
similarity index 83%
rename from asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
rename to asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
index 6a1d806..c2d15b8 100644 (file)
--- a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
+++ b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/northbound/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
@@ -24,11 +24,11 @@
 *
 * Generated from: yang module name: asdcApi-provider-impl yang module local name: asdcApi-provider-impl
 * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Nov 02 03:46:08 EDT 2016
+* Generated at: Mon Aug 14 15:34:51 EDT 2017
 *
 * Do not modify this file unless it is present under src/main directory
 */
-package org.opendaylight.yang.gen.v1.org.openecomp.sdnc.asdcapi.provider.impl.rev140523;
-public class AsdcApiProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.sdnc.asdcapi.provider.impl.rev140523.AbstractAsdcApiProviderModuleFactory {
+package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.asdcapi.provider.impl.rev140523;
+public class AsdcApiProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.asdcapi.provider.impl.rev140523.AbstractAsdcApiProviderModuleFactory {
 
 }

diff --git a/asdcApi/provider/src/main/resources/initial/asdcApi-provider.xml b/asdcApi/provider/src/main/resources/initial/asdcApi-provider.xml
index ab2da90..53f5a11 100644 (file)
--- a/asdcApi/provider/src/main/resources/initial/asdcApi-provider.xml
+++ b/asdcApi/provider/src/main/resources/initial/asdcApi-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:asdcapi:provider:impl">
+                    <type xmlns:prefix="org:onap:ccsdk:sli:northbound:asdcapi:provider:impl">
                         prefix:asdcApi-provider-impl
                     </type>
                     <name>asdcApi-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:asdcapi:provider:impl?module=asdcApi-provider-impl&amp;revision=2014-05-23</capability>
+        <capability>org:onap:ccsdk:sli:northbound:asdcapi:provider:impl?module=asdcApi-provider-impl&amp;revision=2014-05-23</capability>
     </required-capabilities>
 
 </snapshot>

diff --git a/asdcApi/provider/src/main/yang/asdcApi-provider-impl.yang b/asdcApi/provider/src/main/yang/asdcApi-provider-impl.yang
index 94ee883..7a1876c 100755 (executable)
--- a/asdcApi/provider/src/main/yang/asdcApi-provider-impl.yang
+++ b/asdcApi/provider/src/main/yang/asdcApi-provider-impl.yang
@@ -1,7 +1,7 @@
 module asdcApi-provider-impl {
 
     yang-version 1;
-    namespace "org:openecomp:sdnc:asdcapi:provider:impl";
+    namespace "org:onap:ccsdk:sli:northbound:asdcapi:provider:impl";
     prefix "asdcApi-provider-impl";
 
     import config { prefix config; revision-date 2013-04-05; }