aboutsummaryrefslogtreecommitdiffstats
path: root/vnftools/provider/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'vnftools/provider/src/main')
-rw-r--r--vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java27
-rw-r--r--vnftools/provider/src/main/resources/org/opendaylight/blueprint/vnftools-blueprint.xml10
2 files changed, 13 insertions, 24 deletions
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
index 5a06b07c..fe9f9d45 100644
--- a/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java
+++ b/vnftools/provider/src/main/java/org/onap/sdnc/vnftools/VnfToolsActivator.java
@@ -8,9 +8,9 @@
* 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.
@@ -46,29 +46,8 @@ public class VnfToolsActivator implements BundleActivator {
@Override
public void start(BundleContext ctx) throws Exception {
- // Read properties
- Properties props = new Properties();
- String propDir = System.getenv(SDNC_CONFIG_DIR);
- if (propDir == null) {
- propDir = "/opt/sdnc/data/properties";
- }
-
- String propPath = propDir + VNFTOOLS_PROP_VAR;
-
- File propFile = new File(propPath);
-
- if (!propFile.exists()) {
- props = null;
- } else {
-
- try {
- props.load(new FileInputStream(propFile));
- } catch (Exception e) {
- throw new ConfigurationException("Could not load properties file " + propPath, e);
- }
- }
- VnfTools plugin = new VnfTools(props);
+ VnfTools plugin = new VnfTools(null);
LOG.info("Registering service " + plugin.getClass().getName());
registrations.add(ctx.registerService(plugin.getClass().getName(), plugin, null));
diff --git a/vnftools/provider/src/main/resources/org/opendaylight/blueprint/vnftools-blueprint.xml b/vnftools/provider/src/main/resources/org/opendaylight/blueprint/vnftools-blueprint.xml
new file mode 100644
index 00000000..d784db71
--- /dev/null
+++ b/vnftools/provider/src/main/resources/org/opendaylight/blueprint/vnftools-blueprint.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="vnftools" class="org.onap.sdnc.vnftools.VnfTools" />
+ <service ref="vnftools" interface="org.onap.sdnc.vnftools.VnfTools" />
+
+</blueprint> \ No newline at end of file