Fix vnftools load issues

Fixed 2 issues that prevented vnftools from loading:

1) Added org.onap.ccsdk.* to Import-Package in provider manifest (needed
to resolve path to SvcLogicJavaPlugin)
2) Removed useless Properties arg from VnfTools constructor

Change-Id: Iba8213710d012836a7a70fca07c7c232a3b7b539
Issue-ID: SDNC-132
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml
index 2fbeac8..e0cd5b4 100644 (file)
--- a/vnftools/provider/pom.xml
+++ b/vnftools/provider/pom.xml
@@ -77,7 +77,7 @@
                     <instructions>
                         <Bundle-SymbolicName>org.onap.sdnc.vnftools</Bundle-SymbolicName>
                         <Export-Package>org.onap.sdnc.vnftools.*</Export-Package>
-                        <Import-Package>org.onap.sdnc.*,org.osgi.framework.*,org.slf4j.*,java.net.*,org.apache.commons.*</Import-Package>
+                        <Import-Package>org.onap.sdnc.*,org.onap.ccsdk.*,org.osgi.framework.*,org.slf4j.*,java.net.*,org.apache.commons.*</Import-Package>
                         <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|mysql-connector-java|slf4j-api|jcl-over-slf4j|xml-apis|InetAddress|commons-lang3</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>

diff --git a/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfTools.java b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfTools.java
index a452a4a..f1e6a2f 100644 (file)
--- a/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfTools.java
+++ b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfTools.java
@@ -48,10 +48,8 @@ public class VnfTools implements SvcLogicJavaPlugin {
 
     private static final Logger LOG = LoggerFactory.getLogger(VnfTools.class);
 
-    public VnfTools(Properties props) {
-        if (props != null) {
-            LOG.debug("props is not null.");
-        }
+    public VnfTools() {
+
     }
 
     public void checkIfActivateReady(Map<String, String> parameters, SvcLogicContext ctx) throws SvcLogicException {

diff --git a/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java
deleted file mode 100644 (file)
index fe9f9d4..0000000
--- a/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============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=========================================================
- */
-
-package org.onap.sdnc.vnftools;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import org.onap.ccsdk.sli.core.sli.ConfigurationException;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class VnfToolsActivator implements BundleActivator {
-
-       private static final String VNFTOOLS_PROP_VAR = "/vnftools.properties";
-       private static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR";
-
-       @SuppressWarnings("rawtypes")
-       private List<ServiceRegistration> registrations = new LinkedList<ServiceRegistration>();
-
-       private static final Logger LOG = LoggerFactory.getLogger(VnfToolsActivator.class);
-
-       @Override
-       public void start(BundleContext ctx) throws Exception {
-
-               VnfTools plugin = new VnfTools(null);
-
-               LOG.info("Registering service " + plugin.getClass().getName());
-               registrations.add(ctx.registerService(plugin.getClass().getName(), plugin, null));
-       }
-
-       @Override
-       public void stop(BundleContext ctx) throws Exception {
-
-               for (@SuppressWarnings("rawtypes")
-               ServiceRegistration registration : registrations) {
-                       registration.unregister();
-                       registration = null;
-               }
-       }
-
-}

diff --git a/vnftools/provider/src/test/java/org/onap/sdnc/vnftools/VnfToolsTest.java b/vnftools/provider/src/test/java/org/onap/sdnc/vnftools/VnfToolsTest.java
index b30ff86..3cafa8a 100644 (file)
--- a/vnftools/provider/src/test/java/org/onap/sdnc/vnftools/VnfToolsTest.java
+++ b/vnftools/provider/src/test/java/org/onap/sdnc/vnftools/VnfToolsTest.java
@@ -42,14 +42,12 @@ public class VnfToolsTest {
 
     @Before
     public void setUp() throws Exception {
-        vnfTools = new VnfTools(null);
+        vnfTools = new VnfTools();
     }
 
     @Test
     public void testConstructor() throws Exception {
-        VnfTools vTools = new VnfTools(null);
-        Assert.assertTrue("Should have no impact with null property", vTools != null);
-        vTools = new VnfTools(new Properties());
+        VnfTools vTools = new VnfTools();
         Assert.assertTrue("Should have created", vTools != null);
     }
 
@@ -171,7 +169,7 @@ public class VnfToolsTest {
     @Test
     public void testPrintContext() throws Exception {
         Map<String, String> parameters = new HashMap<>();
-        parameters.put(VnfTools.FILENAME, "abc");
+        parameters.put(VnfTools.FILENAME, "target/testPrintContext.out");
         vnfTools.printContext(parameters, mockSvcLogicContext);
     }