Minor changes to VNF SDK integration

Replaced default IP address with 127.0.0.1
Changed configuration file from "config-vnfsdk.yaml" to "config-vnfrepo.yaml"

Change-Id: Id061d42ac5c1596780666d7a17f06a938870b842
Issue-ID: SDC-743
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
index acbfb32..8fc361a 100644 (file)
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
@@ -66,10 +66,10 @@ public class VnfPackageRepositoryImpl implements VnfPackageRepository {
        private static boolean initFlag = false;
 
        // Default VNF Repository configuration
-       private static final String CONFIG_NAMESPACE = "vnfsdk";
+       private static final String CONFIG_NAMESPACE = "vnfrepo";
 
        // Default address for VNF repository docker
-       private static final String DEF_DOCKER_COMPOSE_ADDR = "172.18.0.1";
+       private static final String DEF_DOCKER_COMPOSE_ADDR = "127.0.0.1";
        private static String ipAddress = DEF_DOCKER_COMPOSE_ADDR;
 
        // Default Download package URI and Get VNF package meta-data URI -

diff --git a/openecomp-be/configuration/config-vnfsdk.yaml b/openecomp-be/configuration/config-vnfrepo.yaml
similarity index 100%
rename from openecomp-be/configuration/config-vnfsdk.yaml
rename to openecomp-be/configuration/config-vnfrepo.yaml

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index ad40309..34a35b5 100644 (file)
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -182,7 +182,7 @@
                                                                                        <include>Artifact-Generator.properties</include>
                                                                                        <include>error-configuration.yaml</include>
                                                                                        <include>ecomp-error-configuration.yaml</include>
-                                                                                        <include>config-vnfsdk.yaml</include>
+                                                                                       <include>config-vnfrepo.yaml</include>
                                                                                        <include>logback.xml</include>
                                                                                </includes>
                                                                        </resource>

diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
index e9a00c3..6cba7e9 100644 (file)
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
@@ -54,7 +54,7 @@ end
 
 
 template "VnfrepoConfiguration" do
-   path "/#{jetty_base}/config/onboarding-be/config-vnfsdk.yaml"
+   path "/#{jetty_base}/config/onboarding-be/config-vnfrepo.yaml"
    source "BE-vnfrepo-configuration.yaml.erb"
    owner "jetty"
    group "jetty"