From ce4e5f9a00d2677495240ad367b9bfc4b74752d0 Mon Sep 17 00:00:00 2001
From: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Date: Mon, 18 Jan 2021 05:41:16 +0100
Subject: migrate sli to alu-SR1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

migrate ODL interfaces and fix code for changes in alu-SR1

Issue-ID: CCSDK-3089
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Iad824627c581c902b639a2f0246e3133d4e38c48
---
 .../OSGI-INF/blueprint/aaiservice-blueprint.xml    |  39 -------
 .../blueprint/mdsal-resource-blueprint.xml         |  49 --------
 .../resources/OSGI-INF/blueprint/netbox-client.xml |  37 ------
 .../blueprint/resource-assignment-blueprint.xml    |  33 ------
 .../OSGI-INF/blueprint/resource-assignment.xml     | 129 ---------------------
 .../blueprint/saltstack-adapter-blueprint.xml      |  42 -------
 .../OSGI-INF/blueprint/sql-resource-blueprint.xml  |  41 -------
 7 files changed, 370 deletions(-)
 delete mode 100755 adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml
 delete mode 100755 adaptors/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml
 delete mode 100644 adaptors/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml
 delete mode 100755 adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml
 delete mode 100755 adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml
 delete mode 100755 adaptors/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml
 delete mode 100755 adaptors/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml

(limited to 'adaptors')

diff --git a/adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml b/adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml
deleted file mode 100755
index 970936610..000000000
--- a/adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights
-                          reserved.
-  ================================================================================
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<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">
-
-    <bean id="provider" class="org.onap.ccsdk.sli.adaptors.aai.AAIServiceProvider" />
-
-    <bean id="aaiService" class="org.onap.ccsdk.sli.adaptors.aai.AAIService">
-        <argument ref="provider" />
-    </bean>
-    <service ref="aaiService">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.aai.AAIService</value>
-            <value>org.onap.ccsdk.sli.adaptors.aai.AAIClient</value>
-        </interfaces>
-    </service>
-
-</blueprint>
diff --git a/adaptors/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml b/adaptors/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml
deleted file mode 100755
index 9c691263c..000000000
--- a/adaptors/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights
-                          reserved.
-  ================================================================================
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<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">
-
-    <bean id="propProvider" class="org.onap.ccsdk.sli.adaptors.resource.mdsal.MdsalResourcePropertiesProviderImpl" />
-
-
-    <bean id="configResourceInstance" class="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource">
-        <argument ref="propProvider"/>
-    </bean>
-    
-    <bean id="operResourceInstance" class="org.onap.ccsdk.sli.adaptors.resource.mdsal.OperationalResource">
-        <argument ref="propProvider"/>
-    </bean>
-
-    <service ref="configResourceInstance">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource</value>
-        </interfaces>
-    </service>
-
-    <service ref="operResourceInstance">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.resource.mdsal.OperationalResource</value>
-        </interfaces>
-    </service>
-</blueprint>
diff --git a/adaptors/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml b/adaptors/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml
deleted file mode 100644
index b667dcba5..000000000
--- a/adaptors/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (C) 2018 AT&T, Bell Canada
-
-  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.
-  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="dbLibService"
-      interface="org.onap.ccsdk.sli.core.dblib.DbLibService"/>
-
-    <bean id="netboxProperty" class="org.onap.ccsdk.sli.adaptors.netbox.property.NetboxProperties"/>
-    <bean id="httpClient" class="org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxHttpClient" destroy-method="close">
-        <argument ref="netboxProperty"/>
-    </bean>
-
-    <bean id="netboxClient" class="org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxClientImpl">
-        <argument ref="httpClient"/>
-        <argument ref="dbLibService"/>
-    </bean>
-
-    <service ref="netboxClient"
-      interface="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient"
-      odl:type="default"/>
-
-</blueprint>
diff --git a/adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml b/adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml
deleted file mode 100755
index 77c316d2a..000000000
--- a/adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  							reserved.
-  ================================================================================
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<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="dblib.dataSource" interface="javax.sql.DataSource" filter="(objectClass=org.onap.ccsdk.sli.core.dblib.DbLibService)"/>
-
-        <service ref="resourceAllocator" interface="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator"/>
-
-        <service ref="resourceLockNode" interface="org.onap.ccsdk.sli.adaptors.ra.ResourceLockNode"/>
-
-</blueprint>
diff --git a/adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml b/adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml
deleted file mode 100755
index 7fcc70c54..000000000
--- a/adaptors/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  							reserved.
-  ================================================================================
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<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">
-
-	<!-- JDBC setup -->
-
-	<bean id="rm.dataSource" class="org.onap.ccsdk.sli.adaptors.util.db.DataSourceWrap">
-		<property name="dataSource" ref="dblib.dataSource" />
-	</bean>
-
-	<bean id="lock.dataSource" class="org.onap.ccsdk.sli.adaptors.util.db.CachedDataSourceWrap">
-		<property name="dataSource" ref="rm.dataSource" />
-	</bean>
-
-	<bean id="rm.jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-		<property name="dataSource" ref="rm.dataSource" />
-	</bean>
-
-	<bean id="lock.jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-		<property name="dataSource" ref="lock.dataSource" />
-	</bean>
-
-	<!-- Resource Lock Configuration -->
-
-	<bean id="resourceLockDao" class="org.onap.ccsdk.sli.adaptors.lock.dao.ResourceLockDaoImpl">
-		<property name="jdbcTemplate" ref="lock.jdbcTemplate" />
-	</bean>
-
-	<bean id="lockHelper" class="org.onap.ccsdk.sli.adaptors.lock.comp.LockHelperImpl">
-		<property name="resourceLockDao" ref="resourceLockDao" />
-		<property name="retryCount" value="10" />
-		<property name="lockWait" value="5" /> <!-- Seconds -->
-	</bean>
-
-	<!-- RM Configuration -->
-
-	<bean id="resourceJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceJdbcDaoImpl">
-		<property name="jdbcTemplate" ref="rm.jdbcTemplate" />
-	</bean>
-
-	<bean id="allocationItemJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.AllocationItemJdbcDaoImpl">
-		<property name="jdbcTemplate" ref="rm.jdbcTemplate" />
-	</bean>
-
-	<bean id="resourceLoadJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceLoadJdbcDaoImpl">
-		<property name="jdbcTemplate" ref="rm.jdbcTemplate" />
-	</bean>
-
-	<bean id="resourceDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceDaoImpl">
-		<property name="resourceJdbcDao" ref="resourceJdbcDao" />
-		<property name="allocationItemJdbcDao" ref="allocationItemJdbcDao" />
-		<property name="resourceLoadJdbcDao" ref="resourceLoadJdbcDao" />
-	</bean>
-
-	<bean id="resourceManager" class="org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManagerImpl">
-		<property name="lockHelper" ref="lockHelper" />
-		<property name="resourceDao" ref="resourceDao" />
-		<property name="lockTimeout" value="600" /> <!-- Seconds -->
-	</bean>
-
-	<!-- Rule DAO Configuration -->
-
-	<bean id="resourceRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.ResourceRuleDaoImpl">
-		<property name="jdbcTemplate" ref="rm.jdbcTemplate" />
-	</bean>
-
-	<bean id="rangeRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.RangeRuleDaoImpl">
-		<property name="jdbcTemplate" ref="rm.jdbcTemplate" />
-	</bean>
-
-	<!-- ResourceAllocator Configuration -->
-
-	<bean id="resourceAllocator" class="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator">
-		<property name="resourceManager" ref="resourceManager" />
-		<property name="endPointAllocator" ref="endPointAllocator" />
-		<property name="speedUtil" ref="speedUtil" />
-	</bean>
-
-	<bean id="resourceLockNode" class="org.onap.ccsdk.sli.adaptors.ra.ResourceLockNode">
-		<property name="lockHelper" ref="lockHelper" />
-	</bean>
-
-	<bean id="speedUtil" class="org.onap.ccsdk.sli.adaptors.util.speed.SpeedUtil" />
-
-	<!-- EndPointAllocator Configuration -->
-
-	<bean id="endPointAllocator" class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocatorImpl">
-		<property name="resourceManager" ref="resourceManager" />
-		<property name="allocationRuleMap">
-			<map>
-				<entry key="DEFAULT">
-					<list>
-						<ref component-id="dbAllocationRule" />
-					</list>
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<!-- Resource Allocation Rule Configuration -->
-
-	<bean id="dbAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.DbAllocationRule">
-		<property name="resourceRuleDao" ref="resourceRuleDao" />
-		<property name="rangeRuleDao" ref="rangeRuleDao" />
-	</bean>
-
-</blueprint>
diff --git a/adaptors/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml b/adaptors/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml
deleted file mode 100755
index e360f8184..000000000
--- a/adaptors/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ONAP : CCSDK
-  ================================================================================
-  Copyright (C) 2017 - 2018 Samsung Electronics. All rights
-                          reserved.
-  ================================================================================
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           odl:use-default-for-reference-types="true">
-
-    <bean id="propProvider"
-          class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterPropertiesProviderImpl"/>
-
-    <bean id="saltstackAdapterInstance"
-          class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterImpl">
-        <argument ref="propProvider"/>
-    </bean>
-
-    <service ref="saltstackAdapterInstance">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.saltstack.SaltstackAdapter
-            </value>
-        </interfaces>
-    </service>
-
-</blueprint>
diff --git a/adaptors/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml b/adaptors/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml
deleted file mode 100755
index 5e8d33946..000000000
--- a/adaptors/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights
-                          reserved.
-  ================================================================================
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<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">
-
-    <bean id="propProvider" class="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResourcePropertiesProviderImpl" />
-    <reference id="dblibService" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
-
-    <bean id="sqlResourceInstance" class="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource">
-        <argument ref="propProvider"/>
-        <argument ref="dblibService"/>
-    </bean>
-
-    <service ref="sqlResourceInstance">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource</value>
-        </interfaces>
-    </service>
-
-</blueprint>
-- 
cgit 1.2.3-korg