diff options
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 @@ </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> 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 @@ <div ng-controller="SidenavCtrl as vm" ng-cloak> <md-toolbar class="md-tall md-hue-1"> <div class="image"> - <img src="/openoui/vnfmarket/common/images/logo.png" align="middle" > + <img src="/onapui/vnfmarket/common/images/logo.png" align="middle" > </div> <div layout="column" class="md-toolbar-tools-bottom inset"> </div> @@ -27,7 +27,7 @@ <div class="inset"> <!--<ng-md-icon icon="apps"></ng-md-icon>--> <i> - <img src="/openoui/vnfmarket/common/images/Marketplace.png"> + <img src="/onapui/vnfmarket/common/images/Marketplace.png"> </i> </div> <p> {{ 'module.marketplace.sideNav.marketplaceNav' | translate}} </p> 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 @@ <div class="md-padding nomargin nopadding" flex layout-sm="column"> <md-card class="nomargin"> <md-card-content class="nopadding"> - <img src="/openoui/vnfmarket/common/images/productioncardtype.png" style="width:100%;"> + <img src="/onapui/vnfmarket/common/images/productioncardtype.png" style="width:100%;"> </md-card-content> </md-card> <!-- Start About Page --> @@ -95,14 +95,14 @@ <button class="btn btnDefault iconMargin" ng-click="vm.serviceUpload(false, service.csarId)"> <md-tooltip md-direction="top">{{'common.actions.update' | translate}}</md-tooltip> <i> - <img src="/openoui/vnfmarket/common/images/reupload.png" class="btnIconSpacing"> + <img src="/onapui/vnfmarket/common/images/reupload.png" class="btnIconSpacing"> </i> {{'common.actions.update' | translate}} </button> <button class="btn btnDefault iconMargin deletebutton" ng-click="vm.serviceDelete(service)"> <md-tooltip md-direction="top">{{'common.actions.delete' | translate}}</md-tooltip> <i> - <img src="/openoui/vnfmarket/common/images/delete.png" class="btnIconSpacing"> + <img src="/onapui/vnfmarket/common/images/delete.png" class="btnIconSpacing"> </i> {{'common.actions.delete' | translate}} </button> @@ -110,7 +110,7 @@ <button class="btn btnPrimary downloadIcon" ng-click="vm.downloadService(service.csarId)" ng-disabled="service.downloadCount == -1"> <md-tooltip md-direction="top">{{'common.actions.download' | translate}} </md-tooltip> <i> - <img src="/openoui/vnfmarket/common/images/download.png" class="btnIconSpacing"> + <img src="/onapui/vnfmarket/common/images/download.png" class="btnIconSpacing"> </i> {{'common.actions.download' | translate}} </button> @@ -184,7 +184,7 @@ <md-icon class="md-icon" aria-label="{{'common.actions.update' | translate}}" ng-click="vm.serviceUpload(false, service.csarId)"> <md-tooltip md-direction="top">{{'common.actions.update' | translate}}</md-tooltip> <i> - <img src="/openoui/vnfmarket/common/images/reupload.png" class="btnIconSpacing"> + <img src="/onapui/vnfmarket/common/images/reupload.png" class="btnIconSpacing"> </i> <!-- <i class="material-icons materialIconAdjustment" aria-hidden="true">{{'common.actions.fileUpload' | translate}}</i> --> </md-icon> @@ -192,13 +192,13 @@ <md-tooltip md-direction="top">{{'common.actions.download' | translate}}</md-tooltip> <!-- <i class="material-icons materialIconAdjustment" aria-hidden="true">{{'common.actions.getApp' | translate}}</i> --> <i> - <img src="/openoui/vnfmarket/common/images/download.png" class="btnIconSpacing primaryColor"> + <img src="/onapui/vnfmarket/common/images/download.png" class="btnIconSpacing primaryColor"> </i> </md-icon> <md-icon class="md-icon" aria-label="{{'common.actions.delete' | translate}}" ng-click="vm.serviceDelete(service)"> <md-tooltip md-direction="top">{{'common.actions.delete' | translate}}</md-tooltip> <i> - <img src="/openoui/vnfmarket/common/images/delete.png" class="btnIconSpacing"> + <img src="/onapui/vnfmarket/common/images/delete.png" class="btnIconSpacing"> </i> <!-- <i class="fa fa-trash-o icon-red fa-sm" aria-hidden="true"></i> --> @@ -215,7 +215,7 @@ <div ng-if="vm.services.length == 0"> <div class="content emptyPage"> <div class="imageContainer"> - <img src="/openoui/vnfmarket/common/images/empty.png" class="btnIconSpacing"> + <img src="/onapui/vnfmarket/common/images/empty.png" class="btnIconSpacing"> </div> <h3>{{'module.marketplace.main.emptyList.label' | translate}} <a ng-click="vm.serviceUpload(true)">{{'module.marketplace.main.emptyList.anchor' | translate}}</a> {{'module.marketplace.main.emptyList.labelContinued' | translate}}</h3> </div> 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 @@ <br>
<div>
<!-- <img src="../../../../../common/images/floating-layer-function_old.png">-->
- <img src="/openoui/vnfmarket/common/images/floating_layer_function.png" width="100%" height="40%">
+ <img src="/onapui/vnfmarket/common/images/floating_layer_function.png" width="100%" height="40%">
</div>
<br>
<md-card flex="100" class="nomargin">
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 @@ <button class="btn btnPrimary downloadButton" ng-click="vm.downloadService(vm.service.csarId)">
<md-tooltip md-direction="top">{{'common.actions.download' | translate}} </md-tooltip>
<i>
- <img src="/openoui/vnfmarket/common/images/download.png" class="btnIconSpacing">
+ <img src="/onapui/vnfmarket/common/images/download.png" class="btnIconSpacing">
</i>
{{'common.actions.download' | translate}}
</button>
@@ -50,14 +50,14 @@ <button class="btn btnDefault iconMargin" ng-click="vm.reupload(false,vm.service.csarId)">
<md-tooltip md-direction="top">{{'common.actions.update' | translate}}</md-tooltip>
<i>
- <img src="/openoui/vnfmarket/common/images/reupload.png" class="btnIconSpacing">
+ <img src="/onapui/vnfmarket/common/images/reupload.png" class="btnIconSpacing">
</i>
{{'common.actions.update' | translate}}
</button>
<button class="btn btnDefault" ng-click="vm.serviceDelete(vm.service)">
<md-tooltip md-direction="top">{{'common.actions.delete' | translate}}</md-tooltip>
<i>
- <img src="/openoui/vnfmarket/common/images/delete.png" class="btnIconSpacing">
+ <img src="/onapui/vnfmarket/common/images/delete.png" class="btnIconSpacing">
</i>
{{'common.actions.delete' | translate}}
</button>
@@ -75,8 +75,8 @@ <div class="container-fluid nopadding">
<ul class="nav navbar-nav">
<li ui-sref-active="active " class="fontSize md-title" ng-class="vm.active == 'validation'? 'active' : ''"><a ng-click="vm.navigateValidation()">{{'module.marketplace.serviceDetails.tabs.validationTabTitle' | translate}}</a></li>
- <li ui-sref-active="active " class=" fontSize md-title" ng-class="vm.active == 'lifeCycle'? 'active' : ''"><a ng-click="vm.navigateLifecycle()">{{'module.marketplace.serviceDetails.tabs.lifecycleTabTitle' | translate}}</a></li>
- <li ui-sref-active="active " class=" fontSize md-title" ng-class="vm.active == 'functionalTest'? 'active' : ''"><a ng-click="vm.navigationFunctionalTest()">{{'module.marketplace.serviceDetails.tabs.functionalTabTitle' | translate}}</a></li>
+ <!--<li ui-sref-active="active " class=" fontSize md-title" ng-class="vm.active == 'lifeCycle'? 'active' : ''"><a ng-click="vm.navigateLifecycle()">{{'module.marketplace.serviceDetails.tabs.lifecycleTabTitle' | translate}}</a></li>
+ <li ui-sref-active="active " class=" fontSize md-title" ng-class="vm.active == 'functionalTest'? 'active' : ''"><a ng-click="vm.navigationFunctionalTest()">{{'module.marketplace.serviceDetails.tabs.functionalTabTitle' | translate}}</a></li>-->
</ul>
</div>
</nav>
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 @@ <br>
<div>
<!-- <img src="../../../../../common/images/floating-layer-function.png">-->
- <img src="/openoui/vnfmarket/common/images/floating_layer_function.png" width="100%" height="40%">
+ <img src="/onapui/vnfmarket/common/images/floating_layer_function.png" width="100%" height="40%">
</div>
<br>
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 @@ </div>
<div class="layout-row onboardProgress">
- <div class="flex-33 progress1">
+ <div class="flex-100 progress1">
<div class="progressDiv"></div>
<div class="roundProg"><span>1</span></div>
</div>
- <div class="flex-33 progress2">
+ <!-- <div class="flex-33 progress2">
<div class="progressDiv"></div>
<div class="roundProg"><span>2</span></div>
</div>
<div class="flex-33 progress3">
<div class="progressDiv"></div>
<div class="roundProg"><span>3</span></div>
- </div>
+ </div> -->
</div>
<div class="layout-row">
- <md-card class="flex-33 bg-grey">
+ <md-card class="flex-100 bg-grey">
<div class="onbdContent">
<div class="onboarddiv">
<div class="btnOuter">
@@ -36,7 +36,7 @@ </div>
</div>
</md-card>
- <md-card class="flex-33 bg-grey">
+ <!-- <md-card class="flex-33 bg-grey">
<div class="onbdContent">
<div class="onboarddiv">
<div class="btnOuter">
@@ -69,6 +69,6 @@ </div>
</div>
</div>
- </md-card>
+ </md-card> -->
</div>
</div>
\ 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 Binary files differindex 273a1c31..58036dcb 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/images/logo.png +++ b/vnfmarket/src/main/webapp/vnfmarket/common/images/logo.png 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 @@ <meta name="author" content="" /> <meta name="keywords" content="" /> <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=yes" /> - <link rel="shortcut icon" href="/openoui/vnfmarket/app/assets/images/favicon.ico" /> - <link rel="apple-touch-icon" href="/openoui/vnfmarket/app/assets/images/apple-touch-icon.png" /> - <link rel="apple-touch-icon" sizes="72x72" href="/openoui/vnfmarket/app/assets/images/apple-touch-icon-72x72.png" /> - <link rel="apple-touch-icon" sizes="114x114" href="/openoui/vnfmarket/app/assets/images/apple-touch-icon-114x114.png" /> + <link rel="shortcut icon" href="/onapui/vnfmarket/app/assets/images/favicon.ico" /> + <link rel="apple-touch-icon" href="/onapui/vnfmarket/app/assets/images/apple-touch-icon.png" /> + <link rel="apple-touch-icon" sizes="72x72" href="/onapui/vnfmarket/app/assets/images/apple-touch-icon-72x72.png" /> + <link rel="apple-touch-icon" sizes="114x114" href="/onapui/vnfmarket/app/assets/images/apple-touch-icon-114x114.png" /> <!-- injector:css --> - <link rel="stylesheet" href="/openoui/vnfmarket/common/thirdparty/angular-material-icons/angular-material-icons.css"> - <link rel="stylesheet" href="/openoui/vnfmarket/common/thirdparty/angular-material/angular-material.css"> - <link rel="stylesheet" href="/openoui/vnfmarket/common/thirdparty/components-font-awesome/css/font-awesome.css"> - <link rel="stylesheet" href="/openoui/vnfmarket/common/thirdparty/angular-material-data-table/dist/md-data-table.css"> + <link rel="stylesheet" href="/onapui/vnfmarket/common/thirdparty/angular-material-icons/angular-material-icons.css"> + <link rel="stylesheet" href="/onapui/vnfmarket/common/thirdparty/angular-material/angular-material.css"> + <link rel="stylesheet" href="/onapui/vnfmarket/common/thirdparty/components-font-awesome/css/font-awesome.css"> + <link rel="stylesheet" href="/onapui/vnfmarket/common/thirdparty/angular-material-data-table/dist/md-data-table.css"> <!-- endinjector --> - <link rel="stylesheet" href="/openoui/vnfmarket/common/thirdparty/bootstrap/dist/css/bootstrap.min.css"> + <link rel="stylesheet" href="/onapui/vnfmarket/common/thirdparty/bootstrap/dist/css/bootstrap.min.css"> <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:300,400,500,700,400italic"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> --> - <link rel="stylesheet" href="/openoui/vnfmarket/common/css/main.css"> - <link rel="stylesheet" href="/openoui/vnfmarket/common/css/home.css"> + <link rel="stylesheet" href="/onapui/vnfmarket/common/css/main.css"> + <link rel="stylesheet" href="/onapui/vnfmarket/common/css/home.css"> </head> <body ng-cloak> @@ -46,56 +46,56 @@ <div ui-view layout="row" layout-fill></div> <!--End--> <!-- injector:js --> -<script src="/openoui/vnfmarket/common/thirdparty/jquery/dist/jquery.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/es5-shim/es5-shim.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/json3/lib/json3.min.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular/angular.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-aria/angular-aria.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-mocks/angular-mocks.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-cookies/angular-cookies.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-animate/angular-animate.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-sanitize/angular-sanitize.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-resource/angular-resource.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-material-icons/angular-material-icons.min.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-messages/angular-messages.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-material/angular-material.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-ui-router/release/angular-ui-router.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/bootstrap/dist/js/bootstrap.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-material-data-table/dist/md-data-table.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-translate/angular-translate.js"></script> -<script src="/openoui/vnfmarket/common/thirdparty/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script> -<script src="/openoui/vnfmarket/app/app.js"></script> -<script src="/openoui/vnfmarket/app/app.config.js"></script> -<script src="/openoui/vnfmarket/common/config/configuration.js"></script> -<script src="/openoui/vnfmarket/common/config/baseUrlConfig.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/homeModule.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/homeRoute.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/homeCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceDelete/serviceDeleteCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceDetails/serviceDetailsCtrl.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/jquery/dist/jquery.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/es5-shim/es5-shim.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/json3/lib/json3.min.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular/angular.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-aria/angular-aria.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-mocks/angular-mocks.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-cookies/angular-cookies.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-animate/angular-animate.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-sanitize/angular-sanitize.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-resource/angular-resource.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-material-icons/angular-material-icons.min.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-messages/angular-messages.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-material/angular-material.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-ui-router/release/angular-ui-router.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/bootstrap/dist/js/bootstrap.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-material-data-table/dist/md-data-table.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-translate/angular-translate.js"></script> +<script src="/onapui/vnfmarket/common/thirdparty/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script> +<script src="/onapui/vnfmarket/app/app.js"></script> +<script src="/onapui/vnfmarket/app/app.config.js"></script> +<script src="/onapui/vnfmarket/common/config/configuration.js"></script> +<script src="/onapui/vnfmarket/common/config/baseUrlConfig.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/homeModule.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/homeRoute.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/homeCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDelete/serviceDeleteCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDetails/serviceDetailsCtrl.js"></script> <!-- --> -<script src="/openoui/vnfmarket/app/modules/home/serviceDetails/functionalTest/functionalTestService.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDetails/functionalTest/functionalTestService.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceDetails/functionalTest/functionalTestCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceDetails/validation/validationCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceDetails/lifeCycle/lifeCycleCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDetails/functionalTest/functionalTestCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDetails/validation/validationCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDetails/lifeCycle/lifeCycleCtrl.js"></script> <!-- --> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/layouts/main-page/mainPageCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/layouts/side-nav/sidenavCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/homeService.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceDelete/serviceDeleteService.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceDetails/serviceDetailsService.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/serviceUploadService.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/onboarding/onboardingSuccess.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/onboarding/onBoardingService.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/validationCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/functionalTestCtrl.js"></script> -<script src="/openoui/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/lifeCycleCtrl.js"></script> -<script src="/openoui/vnfmarket/common/services/httpService.js"></script> -<script src="/openoui/vnfmarket/common/directives/autofocus/autofocusDirective.js"></script> -<script src="/openoui/vnfmarket/common/directives/fileupload/fileuploadDirective.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/layouts/main-page/mainPageCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/layouts/side-nav/sidenavCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/homeService.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDelete/serviceDeleteService.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceDetails/serviceDetailsService.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/serviceUploadService.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/onboarding/onboardingSuccess.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/onboarding/onBoardingService.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/validationCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/functionalTestCtrl.js"></script> +<script src="/onapui/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/lifeCycleCtrl.js"></script> +<script src="/onapui/vnfmarket/common/services/httpService.js"></script> +<script src="/onapui/vnfmarket/common/directives/autofocus/autofocusDirective.js"></script> +<script src="/onapui/vnfmarket/common/directives/fileupload/fileuploadDirective.js"></script> <!-- endinjector --> </body> </html> |
