From efd658af8205a0e9b9f7e9868b759d3d0050666e Mon Sep 17 00:00:00 2001 From: Murali-P Date: Wed, 22 Nov 2017 11:47:12 +0530 Subject: [PATCH] Remove traces of Open-O Issue-ID: VNFSDK-131 Change-Id: I118bc2d3302c0476ae17e26548b86965b6cc15f3 Signed-off-by: Murali-P --- .../vnfsdk/marketplace/common/CommonConstant.java | 8 +- .../vnfsdk/marketplace/msb/MsbRegistration.java | 4 +- .../validatelifecycle/LifecycleTestExceutor.java | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/vnfmarket/app/app.config.js | 2 +- .../webapp/vnfmarket/app/modules/home/home.html | 4 +- .../webapp/vnfmarket/app/modules/home/homeRoute.js | 5 +- .../vnfmarket/app/modules/home/marketplace.html | 16 +-- .../home/serviceDetails/functionalTest/view.html | 2 +- .../home/serviceDetails/serviceDetails.html | 10 +- .../onboarding/functionalTest/view.html | 2 +- .../home/serviceUpload/onboarding/onboarding.html | 12 +-- .../home/serviceUpload/onboarding/onboarding.js | 16 ++- .../home/serviceUpload/serviceUploadCtrl.js | 5 +- .../vnfmarket/common/config/configuration.js | 22 ++-- .../main/webapp/vnfmarket/common/images/logo.png | Bin 4742 -> 7353 bytes .../webapp/vnfmarket/common/locale/locale-en.json | 6 +- .../vnfmarket/common/services/httpService.js | 4 +- vnfmarket/src/main/webapp/vnfmarket/index.html | 116 ++++++++++----------- 19 files changed, 123 insertions(+), 115 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 @@ 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 273a1c3128adc2845f091cafb508a7c1c6c02182..58036dcb54b3010f23bff6e0a0b1b83457e1b9c3 100644 GIT binary patch literal 7353 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 UQtAUV^Z)<=07*qoM6N<$f~k`u#Q*>R 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 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -- 2.16.6