From: Murali-P Date: Wed, 22 Nov 2017 06:17:12 +0000 (+0530) Subject: Remove traces of Open-O X-Git-Tag: v1.1.0~36 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=efd658af8205a0e9b9f7e9868b759d3d0050666e;p=vnfsdk%2Frefrepo.git Remove traces of Open-O Issue-ID: VNFSDK-131 Change-Id: I118bc2d3302c0476ae17e26548b86965b6cc15f3 Signed-off-by: Murali-P --- 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 @@ Jersey RESTful Application - /openoapi/vnfsdk-marketplace/v1/* + /onapapi/vnfsdk-marketplace/v1/* diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js b/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js index 4b9af093..ffe6e110 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js @@ -85,7 +85,7 @@ $translateProvider.useSanitizeValueStrategy(null); $translateProvider.useStaticFilesLoader({ - prefix: "/openoui/vnfmarket/common/locale/locale-", + prefix: "/onapui/vnfmarket/common/locale/locale-", suffix: ".json" }); $translateProvider.preferredLanguage('en') diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html index a10cf5fe..da8fdc3e 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html @@ -17,7 +17,7 @@
- +
@@ -27,7 +27,7 @@
- +

{{ 'module.marketplace.sideNav.marketplaceNav' | translate}}

diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js index be24302e..bcd7906b 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js @@ -26,7 +26,7 @@ angular.module('vnfmarket') .config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider, vnfConfig) { - var homePath = '/openoui/vnfmarket/app/modules/home'; + var homePath = '/onapui/vnfmarket/app/modules/home'; $stateProvider .state('home', { url: '', @@ -73,7 +73,8 @@ angular.module('vnfmarket') url: '/onboarding', templateUrl: homePath + '/serviceUpload/onboarding/onboarding.html', params: { - csarId: undefined + csarId: undefined, + csarName: undefined }, controller: 'onBoardingCtrl', controllerAs: 'vm' diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html index eb4cf6b5..c9c4a313 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html @@ -16,7 +16,7 @@
- + @@ -95,14 +95,14 @@ @@ -110,7 +110,7 @@ @@ -184,7 +184,7 @@ {{'common.actions.update' | translate}} - + @@ -192,13 +192,13 @@ {{'common.actions.download' | translate}} - + {{'common.actions.delete' | translate}} - + @@ -215,7 +215,7 @@
- +

{{'module.marketplace.main.emptyList.label' | translate}} {{'module.marketplace.main.emptyList.anchor' | translate}} {{'module.marketplace.main.emptyList.labelContinued' | translate}}

diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html index 86875311..73aaba18 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html @@ -3,7 +3,7 @@
- +

diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html index a6221996..e44dfbef 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html @@ -42,7 +42,7 @@ @@ -50,14 +50,14 @@ @@ -75,8 +75,8 @@
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html index 35fdb528..7a626ff6 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html @@ -12,7 +12,7 @@
- +

diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html index 2c40b9d5..57e65451 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html @@ -5,21 +5,21 @@
-
+
1
-
+
- +
@@ -36,7 +36,7 @@
- +
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js index b2f09fe3..c2c735be 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js @@ -50,8 +50,11 @@ $(".onboardProgress .progress3 .progressDiv").removeClass("progressed"); $(".onboardProgress .progress3 .roundProg").removeClass("progressed"); + var fileName = $stateParams.csarName + + vm.mainTitle = fileName.slice(0, fileName.lastIndexOf(".")); - vm.mainTitle = "clearwater_ns"; + //vm.mainTitle = $stateParams.csarName;//"clearwater_ns"; var csarId = $stateParams.csarId; if(!csarId) { $state.go("home.marketplace", {}); @@ -159,10 +162,13 @@ //First list is completed $(".onboardProgress .progress1 .progressDiv").addClass("progressed"); $(".onboardProgress .progress1 .roundProg").addClass("progressed"); - currentIteration.list = vm.lifeCycle; - currentIteration.item = 0 + /*currentIteration.list = vm.lifeCycle; + currentIteration.item = 0*/ + + listIterFinished = true; + $state.go('home.onboardingSuccess', {"csarId": csarId}); } - else if(currentIteration.list == vm.lifeCycle){ + /*else if(currentIteration.list == vm.lifeCycle){ //Second list is completed $(".onboardProgress .progress2 .progressDiv").addClass("progressed"); $(".onboardProgress .progress2 .roundProg").addClass("progressed"); @@ -176,7 +182,7 @@ $(".onboardProgress .progress3 .roundProg").addClass("progressed"); listIterFinished = true; $state.go('home.onboardingSuccess', {"csarId": csarId}); - } + }*/ } } else if(stepStatus == -1) { diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js index f87cba43..7a2fdaaa 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js @@ -79,16 +79,17 @@ }, 500); if(vm.isUpload){ + var filename = vm.service.file.name; serviceUploadService.postServiceUpload(fd, headers) .then(function(response) { vm.hide("Uploading") - $state.go('home.onboarding', {"csarId": response.data.csarId}); + $state.go('home.onboarding', {"csarId": response.data.csarId, "csarName": filename}); }); } else { serviceUploadService.repostServiceUpload(fd, headers, vm.csarId) .then(function(response) { vm.hide("Uploading") - $state.go('home.onboarding', {"csarId": response.data.csarId}); + $state.go('home.onboarding', {"csarId": response.data.csarId, "csarName": filename}); }); } }; diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js b/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js index fb8f85e5..33faa97f 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js +++ b/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js @@ -30,49 +30,49 @@ "api": { "home": { "postServiceUpload": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars", "method": "POST" }, "repostServiceUpload": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/reupload", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/reupload", "method": "POST" }, "getFeaturesList": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars", "method": "GET" }, "downloadServiceFile": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/files", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/files", "method": "GET" }, "serviceDelete": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId", "method": "DELETE" }, "serviceDetails": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId", "method": "GET" }, "getFunctionTestDetails" : { - "url" : "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/operresult?operTypeId=functiontest", + "url" : "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/operresult?operTypeId=functiontest", "method" : "GET" }, "updateDownloadCount" :{ - "url" : "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/downloaded", + "url" : "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/downloaded", "method" : "GET" }, "getOnBoardingSteps": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/onboardsteps", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/onboardsteps", "method": "GET" }, "getFunctionalList": { - "url": "/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/onboardstatus", + "url": "/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/:csarId/onboardstatus", "method": "GET" } } }, "modulePath": { - "home": "/openoui/vnfmarket/app/modules/home" + "home": "/onapui/vnfmarket/app/modules/home" } }) })(); \ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/images/logo.png b/vnfmarket/src/main/webapp/vnfmarket/common/images/logo.png index 273a1c31..58036dcb 100644 Binary files a/vnfmarket/src/main/webapp/vnfmarket/common/images/logo.png and b/vnfmarket/src/main/webapp/vnfmarket/common/images/logo.png differ diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json b/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json index 8ca46794..d4be95e9 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json +++ b/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json @@ -110,11 +110,11 @@ }, "sideNav" : { - "title" : "VNF Marketplace", - "marketplaceNav" : "Marketplace" + "title" : "VNF Repository", + "marketplaceNav" : "VNF Repository" }, "main" : { - "headerTitle" : "Welcome to VNF Marketplace", + "headerTitle" : "Welcome to VNF Repository", "description" : "Market place for VNF-SDK does the following task:", "pointOne" : "Upload and download of VNF products and offerings", "pointTwo" : "Show the interface about other component in VNF-SDK", diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js b/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js index 3141a1f4..bc077a10 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js +++ b/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js @@ -51,7 +51,7 @@ var parentEl = angular.element(document.body); $mdDialog.show({ parent:parentEl, - templateUrl:'/openoui/vnfmarket/common/templates/serverError.html', + templateUrl:'/onapui/vnfmarket/common/templates/serverError.html', locals:{ error:error }, @@ -94,7 +94,7 @@ var parentEl = angular.element(document.body); $mdDialog.show({ parent:parentEl, - templateUrl:'/openoui/vnfmarket/common/templates/serverError.html', + templateUrl:'/onapui/vnfmarket/common/templates/serverError.html', locals:{ error:error }, diff --git a/vnfmarket/src/main/webapp/vnfmarket/index.html b/vnfmarket/src/main/webapp/vnfmarket/index.html index 1293150f..20252f13 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/index.html +++ b/vnfmarket/src/main/webapp/vnfmarket/index.html @@ -24,21 +24,21 @@ - - - - + + + + - - - - + + + + - + - - + + @@ -46,56 +46,56 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +