diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-07-11 08:47:49 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2019-08-15 16:36:48 +0000 |
| commit | c74f6af8d7b72eeeee7ceedbf82fc8cecef1ae3d (patch) | |
| tree | c734478dca6678c317f0b793a11b048874835cf5 /blueprints-processor/plugin/assignment-provider | |
| parent | a68f2b849f86ab0a146648385785d40595388a52 (diff) | |
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>
Diffstat (limited to 'blueprints-processor/plugin/assignment-provider')
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/pom.xml | 37 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml | 63 |
2 files changed, 97 insertions, 3 deletions
diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index ff9bcda88..1b7f46ea3 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -21,12 +21,12 @@ <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</groupId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <artifactId>blueprints-assignment-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Assignment - Provider</name> @@ -71,11 +71,43 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.21.0-GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-support</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-reflect</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>1.6.4</version> <scope>test</scope> </dependency> </dependencies> @@ -92,7 +124,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>${maven.bundle.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..f15429dfe --- /dev/null +++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ 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="componentNodeService"
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
+
+ <reference id="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+ <reference id="configModelService"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+ <reference id="configRestAdaptorService"
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+ <reference id="configGeneratorService"
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
+
+ <!-- Expose the Common Component Bean -->
+ <bean id="configAssignmentNode"
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode">
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ <argument ref="configModelService" />
+ <argument ref="componentNodeService" />
+ <argument ref="configGeneratorService" />
+ </bean>
+
+ <service ref="configAssignmentNode"
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode" />
+
+ <bean id="configAssignmentService"
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentServiceImpl">
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ <argument ref="configModelService" />
+ <argument ref="componentNodeService" />
+ <argument ref="configGeneratorService" />
+ </bean>
+
+ <service ref="configAssignmentService"
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentService" />
+
+</blueprint>
|