Remove traces of Open-O

Issue-ID: VNFSDK-131

Change-Id: I118bc2d3302c0476ae17e26548b86965b6cc15f3
Signed-off-by: Murali-P <murali.p@huawei.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonConstant.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonConstant.java
index 92d19de6..e167ae10 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonConstant.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonConstant.java
@@ -67,7 +67,7 @@ public class CommonConstant {
   public static final int SUCESS = 0;
   public static final int FAILED = -1;
 
-  public static final  String CATALOUGE_UPLOAD_URL = "/openoapi/catalog/v1/csars";
+  public static final  String CATALOUGE_UPLOAD_URL = "/onapapi/catalog/v1/csars";
 
   private CommonConstant (){
       // Cannot create instance of the class
@@ -75,8 +75,8 @@ public class CommonConstant {
 
   public static class functionTest
   {
-      public static final String FUNCTEST_URL = "/openoapi/vnfsdk/v1/functest/";
-      public static final String FUNCTEST_RESULT_URL = "/openoapi/vnfsdk/v1/functest/download/";
+      public static final String FUNCTEST_URL = "/onapapi/vnfsdk/v1/functest/";
+      public static final String FUNCTEST_RESULT_URL = "/onapapi/vnfsdk/v1/functest/download/";
       public static final String FUNCTEST_OPERTYPE_ID = "functiontest";
       public static final String FUNCTEST_PACKAGE_EXISTS = "packageExists";
       public static final String FUNCTEST_EXEC = "functestexec";
@@ -101,7 +101,7 @@ public class CommonConstant {
 
   public static class LifeCycleTest
   {
-      public static final String LIFECYCLE_TEST_URL = "/openoapi/nslcm/v1/vnfpackage";
+      public static final String LIFECYCLE_TEST_URL = "/onapapi/nslcm/v1/vnfpackage";
       public static final String LIFECYCLE_TEST_OPERTYPE_ID = "lifecycletest";
       public static final String LIFECYCLE_TEST_EXEC = "lifecycleTestexec";
       private LifeCycleTest() {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
index 1278c2ee..4c1344d8 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
@@ -42,8 +42,8 @@ public class MsbRegistration {
     private static MsbRegistration oMsbRegistration = new MsbRegistration();
 
     private static final String MSB_REGISTION_FILE = "etc/microservice/marketplace_rest.json";
-    private static final String MSB_REGISTION_URL = "/openoapi/microservices/v1/services?createOrUpdate=false";
-    private static final String MSB_UN_REGISTION_URL = "/openoapi/microservices/v1/services/{0}/version/{1}/nodes/{2}/{3}";
+    private static final String MSB_REGISTION_URL = "/onapapi/microservices/v1/services?createOrUpdate=false";
+    private static final String MSB_UN_REGISTION_URL = "/onapapi/microservices/v1/services/{0}/version/{1}/nodes/{2}/{3}";
     private static final String NODES = "nodes";
     private static final String IP = "ip";
     private static final String PORT = "port";
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
index 3cf5310b..f48a07f3 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
@@ -41,7 +41,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 /* CALL Flow: onBoardingHandler --> LifecycleTestHook--> LifecycleTestExecutor */
 public class LifecycleTestExceutor {
 	private static final Logger logger = LoggerFactory.getLogger(LifecycleTestExceutor.class);
-	public static final String CATALOUGE_UPLOAD_URL_IN = "{0}:{1}/openoapi/catalog/v1/csars";
+	public static final String CATALOUGE_UPLOAD_URL_IN = "{0}:{1}/onapapi/catalog/v1/csars";
 
 	private LifecycleTestExceutor() {
 		// Empty constructor
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml b/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml
index 21497057..8dc5575c 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml
@@ -18,7 +18,7 @@
    </servlet> 
    <servlet-mapping> 
       <servlet-name>Jersey RESTful Application</servlet-name> 
-      <url-pattern>/openoapi/vnfsdk-marketplace/v1/*</url-pattern> 
+      <url-pattern>/onapapi/vnfsdk-marketplace/v1/*</url-pattern> 
    </servlet-mapping>  
 
     <filter>