From c74f6af8d7b72eeeee7ceedbf82fc8cecef1ae3d Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 11 Jul 2019 08:47:49 -0400
Subject: Update to Neon

Apply code updates to port to Neon.

Change-Id: I159309494ec64209d9fa23fc515643f1e31fe146
Issue-ID: CCSDK-1389
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 sdnr/northbound/energysavings/features/pom.xml     | 10 ++----
 sdnr/northbound/energysavings/installer/pom.xml    |  2 +-
 sdnr/northbound/energysavings/model/pom.xml        |  2 +-
 sdnr/northbound/energysavings/pom.xml              |  2 +-
 sdnr/northbound/energysavings/provider/pom.xml     |  2 +-
 .../OSGI-INF/blueprint/impl-blueprint.xml          | 40 ++++++++++++++++++++++
 .../ccsdk-features-sdnr-northbound-all/pom.xml     |  4 +--
 sdnr/northbound/features/installer/pom.xml         |  4 +--
 sdnr/northbound/features/pom.xml                   |  4 +--
 sdnr/northbound/oofpcipoc/consumer/pom.xml         |  4 +--
 .../OSGI-INF/blueprint/impl-blueprint.xml          | 29 ++++++++++++++++
 sdnr/northbound/oofpcipoc/feature/pom.xml          |  4 +--
 sdnr/northbound/oofpcipoc/installer/pom.xml        |  4 +--
 sdnr/northbound/oofpcipoc/model/pom.xml            | 16 ++++-----
 sdnr/northbound/oofpcipoc/pom.xml                  |  4 +--
 sdnr/northbound/oofpcipoc/provider/pom.xml         |  4 +--
 .../OSGI-INF/blueprint/impl-blueprint.xml          | 34 ++++++++++++++++++
 sdnr/northbound/pom.xml                            |  4 +--
 18 files changed, 134 insertions(+), 39 deletions(-)
 create mode 100644 sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
 create mode 100644 sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
 create mode 100644 sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml

(limited to 'sdnr/northbound')

diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml
index 03150b184..37ceeb835 100644
--- a/sdnr/northbound/energysavings/features/pom.xml
+++ b/sdnr/northbound/energysavings/features/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -16,13 +16,7 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.11.1</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+      
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml
index f689d90ad..48febff61 100755
--- a/sdnr/northbound/energysavings/installer/pom.xml
+++ b/sdnr/northbound/energysavings/installer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml
index 9afa4cc40..7eceab4bf 100644
--- a/sdnr/northbound/energysavings/model/pom.xml
+++ b/sdnr/northbound/energysavings/model/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml
index b4bff6065..8812c8f5f 100644
--- a/sdnr/northbound/energysavings/pom.xml
+++ b/sdnr/northbound/energysavings/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml
index 9c68876c1..3ce3ce545 100644
--- a/sdnr/northbound/energysavings/provider/pom.xml
+++ b/sdnr/northbound/energysavings/provider/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
diff --git a/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..7dfdc4d35
--- /dev/null
+++ b/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ ===================================================================
+ Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+
+ Unless otherwise specified, all software contained herein is licensed
+ under the Apache License, Version 2.0 (the “License”);
+ you may not use this software 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<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="dataBroker"
+    interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+    odl:type="default" />
+
+  <bean id="provider"
+<<<<<<< HEAD
+    class="org.onap.sdnc.northbound.sdnr.impl.EnergysavingsProvider"
+=======
+    class="org.onap.ccsdk.features.sdnr.northbound.EnergysavingsProvider"
+>>>>>>> 4a0fb45... Rename package to new ccsdk/features repo
+    init-method="init" destroy-method="close">
+    <argument ref="dataBroker" />
+  </bean>
+
+</blueprint>
diff --git a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
index e06fd214d..c218dece9 100644
--- a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
+++ b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
   <artifactId>sdnr-northbound-all</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
   <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name>
diff --git a/sdnr/northbound/features/installer/pom.xml b/sdnr/northbound/features/installer/pom.xml
index 797bcee80..bfd10f751 100644
--- a/sdnr/northbound/features/installer/pom.xml
+++ b/sdnr/northbound/features/installer/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
   <artifactId>sdnr-northbound-features-installer</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name>
diff --git a/sdnr/northbound/features/pom.xml b/sdnr/northbound/features/pom.xml
index ce55dd9f5..fcb5eeb25 100644
--- a/sdnr/northbound/features/pom.xml
+++ b/sdnr/northbound/features/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
 	<artifactId>sdnr-northbound-feature-aggregator</artifactId>
-	<version>0.5.2-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-features-sdnr-northbound :: features</name>
diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml
index 437f98a06..2b4886283 100644
--- a/sdnr/northbound/oofpcipoc/consumer/pom.xml
+++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
 	<artifactId>oofpcipoc-consumer</artifactId>
-	<version>0.5.2-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 
 	<dependencyManagement>
diff --git a/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..6bb5e3833
--- /dev/null
+++ b/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright © ${copyrightYear} ${copyright} 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="svcLogicService"
+             interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" />
+
+   <bean id="client" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocClient">
+       <argument ref="svcLogicService" />
+   </bean>
+
+  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+    odl:type="default" />
+
+  <!-- Register the OofpcipocListener to receive yang notifications -->
+
+  <odl:notification-listener ref="listener"/>
+
+  <bean id="listener" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocHandleNotif">
+    <argument ref="dataBroker" />
+    <argument ref="client" />
+  </bean>
+
+</blueprint>
diff --git a/sdnr/northbound/oofpcipoc/feature/pom.xml b/sdnr/northbound/oofpcipoc/feature/pom.xml
index 56c23d9a3..351267722 100644
--- a/sdnr/northbound/oofpcipoc/feature/pom.xml
+++ b/sdnr/northbound/oofpcipoc/feature/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
   <artifactId>sdnr-oofpcipoc</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
   <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name>
diff --git a/sdnr/northbound/oofpcipoc/installer/pom.xml b/sdnr/northbound/oofpcipoc/installer/pom.xml
index 382b6e1ff..eb2f774dd 100644
--- a/sdnr/northbound/oofpcipoc/installer/pom.xml
+++ b/sdnr/northbound/oofpcipoc/installer/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
   <artifactId>oofpcipoc-installer</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name>
diff --git a/sdnr/northbound/oofpcipoc/model/pom.xml b/sdnr/northbound/oofpcipoc/model/pom.xml
index 00820b7dd..84ea3130e 100644
--- a/sdnr/northbound/oofpcipoc/model/pom.xml
+++ b/sdnr/northbound/oofpcipoc/model/pom.xml
@@ -5,24 +5,22 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
   <artifactId>oofpcipoc-model</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>ietf-yang-types-20130715</artifactId>
-    </dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
+
+    
   </dependencies>
   <build>
     <pluginManagement>
diff --git a/sdnr/northbound/oofpcipoc/pom.xml b/sdnr/northbound/oofpcipoc/pom.xml
index 0c119c719..b0387f66f 100644
--- a/sdnr/northbound/oofpcipoc/pom.xml
+++ b/sdnr/northbound/oofpcipoc/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
         <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
 	<artifactId>oofpcipoc</artifactId>
-	<version>0.5.2-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-features-sdnr-northbound :: oofpcipoc</name>
diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml
index 34ef1e4d3..015b968a4 100644
--- a/sdnr/northbound/oofpcipoc/provider/pom.xml
+++ b/sdnr/northbound/oofpcipoc/provider/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
   <artifactId>oofpcipoc-provider</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencyManagement>
diff --git a/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..72278ffa2
--- /dev/null
+++ b/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright © ${copyrightYear} ${copyright} 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="svcLogicService"
+             interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" />
+
+   <bean id="client" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocClient">
+       <argument ref="svcLogicService" />
+   </bean>
+
+  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+    odl:type="default" />
+
+  <reference id="notificationService"
+             interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+             odl:type="default" />
+
+  <reference id="rpcRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
+    odl:type="default" />
+
+  <bean id="provider" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocProvider">
+    <argument ref="dataBroker" />
+    <argument ref="rpcRegistry" />
+    <argument ref="notificationService" />
+    <argument ref="client" />
+  </bean>
+
+</blueprint>
diff --git a/sdnr/northbound/pom.xml b/sdnr/northbound/pom.xml
index cbbd31e34..0ae151aef 100644
--- a/sdnr/northbound/pom.xml
+++ b/sdnr/northbound/pom.xml
@@ -24,13 +24,13 @@
         <parent>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>odlparent-lite</artifactId>
-                <version>1.3.3-SNAPSHOT</version>
+                <version>1.4.0-SNAPSHOT</version>
                 <relativePath/>
         </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
     <artifactId>sdnr-northbound</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ccsdk-sdnr-northbound :: features</name>
     <description>SDN-R RAN and OOF PCI ANR POC </description>
-- 
cgit 1.2.3-korg