TENANT_ID: "tenantID",
TENANT_NAME: "tenantName",
TRUE: "true",
- UCPE_VMS: "uCPE-VMS",
+ UCPE_VMS: "JOSEFINA",
VF_MODULE: "vfModule",
VNF: "vnf",
VNF_CODE: "vnfCode",
//COMPONENT_LIST_NAMED_QUERY_ID : "ed0a0f5b-cf79-4784-88b2-911cd726cd3d",
CUSTOMER_ID_1: "icore9883749",
DELETE_INSTANCE_ID_1: "ff305d54-75b4-ff1b-fff1-eb6b9e5460ff",
- GATEWAY_ADDRESS_1: "10.10.125.1",
+ GATEWAY_ADDRESS_1: "10.0.0.10",
GLOBAL_SUBSCRIBER_ID_1: "C12345",
INSTANCE_ID_1: "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
INSTANCE_ID_2: "ff305d54-75b4-ff1b-adb2-eb6b9e5460ff",
AAI_GET_SERVICES_BY_TYPE: "aai_get_models_by_service_type",
AAI_GET_TENANTS: "aai_get_tenants/",
AAI_SUB_DETAILS_PATH: "aai_sub_details/",
+ AAI_OMIT_SERVICE_INSTANCES : "&omitServiceInstances=",
AAI_GET_VERSION_BY_INVARIANT_ID: "aai_get_version_by_invariant_id/",
AAI_GET_PORT_MIRRORING_CONFIGS_DATA: "aai_getPortMirroringConfigsData",
AAI_GET_PORT_MIRRORING_SOURCE_PORTS: "aai_getPortMirroringSourcePorts",
FLAG_ASYNC_INSTANTIATION: "FLAG_ASYNC_INSTANTIATION",
FLAG_NETWORK_TO_ASYNC_INSTANTIATION: "FLAG_NETWORK_TO_ASYNC_INSTANTIATION",
FLAG_ADD_MSO_TESTAPI_FIELD: "FLAG_ADD_MSO_TESTAPI_FIELD",
- FLAG_COLLECTION_RESOURCE_SUPPORT: "FLAG_COLLECTION_RESOURCE_SUPPORT",
FLAG_SHOW_ASSIGNMENTS: "FLAG_SHOW_ASSIGNMENTS",
FLAG_SHOW_VERIFY_SERVICE: "FLAG_SHOW_VERIFY_SERVICE",
FLAG_PNP_INSTANTIATION: "FLAG_PNP_INSTANTIATION",
- FLAG_DUPLICATE_VNF: "FLAG_DUPLICATE_VNF",
FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS: "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS",
FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS: "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS",
FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST: "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST",
FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY: "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY",
FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE: "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE",
FLAG_HANDLE_SO_WORKFLOWS: "FLAG_HANDLE_SO_WORKFLOWS",
- FLAG_CREATE_ERROR_REPORTS: "FLAG_CREATE_ERROR_REPORTS"
+ FLAG_CREATE_ERROR_REPORTS: "FLAG_CREATE_ERROR_REPORTS",
+ FLAG_VF_MODULE_RESUME_STATUS_CREATE: "FLAG_VF_MODULE_RESUME_STATUS_CREATE",
+ FLAG_1908_RELEASE_TENANT_ISOLATION: "FLAG_1908_RELEASE_TENANT_ISOLATION",
+ FLAG_FLASH_REPLACE_VF_MODULE: "FLAG_FLASH_REPLACE_VF_MODULE",
}
};
SERVICE_UUID : "Service UUID",\r
SERVICE_VERSION : "Service Version",\r
SUBSCRIBER_NAME : "Subscriber Name",\r
- MOBILITY : "Mobility",\r
+ EMANUEL : "Emanuel",\r
SUPPRESS_ROLLBACK : "Suppress Rollback on Failure",\r
SDN_C_PRELOAD : "SDN-C Pre-Load",\r
UPLOAD_SUPPLEMENTORY_DATA_FILE : "Upload Supplementary Data file",\r
LINE_OF_BUSINESS: {\r
name: NAME.LINE_OF_BUSINESS,\r
id: ID.LINE_OF_BUSINESS,\r
- type: PARAMETER.MULTI_SELECT,\r
+ type: PARAMETER.SELECT,\r
isEnabled: true,\r
prompt: PROMPT.LINE_OF_BUSINESS,\r
isRequired: false\r
COMPONENT_LIST_NAMED_QUERY_ID : COMPONENT_LIST_NAMED_QUERY_ID,\r
SCHEDULER_CALLBACK_URL: SCHEDULER_CALLBACK_URL,\r
SCHEDULER_PORTAL_URL: SCHEDULER_PORTAL_URL,\r
- SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL\r
+ SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL\r
};\r
})())\r
};\r
\r
\r
- $scope.isCR = !_.isEmpty($scope.service.model.collectionResource) && featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_COLLECTION_RESOURCE_SUPPORT);\r
+ $scope.isCR = !_.isEmpty($scope.service.model.collectionResources);\r
if ($scope.isCR)\r
prepareCr();\r
else\r
});\r
};\r
\r
+ $scope.allowTransferToNewScreenAndShowButton = function (){\r
+ if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_REPLACE_VF_MODULE)) {\r
+ return $scope.isPermitted && !($scope.isMacro());\r
+ }\r
+ return false;\r
+ };\r
+\r
$scope.deleteService = function (serviceObject, serviceOrchestrationStatus) {\r
\r
var serviceInstance = serviceObject.object;\r
$scope.resume = function (serviceObject, vfModule, vnfModel) {\r
populate_popup_vfModule(serviceObject, vfModule, vnfModel);\r
setCurrentVNFModelInfo(vnfModel);\r
+\r
+ var availableVolumeGroupList = [];\r
+ angular.forEach(vfModule.volumeGroups, function (volumeGroupInstance, key) {\r
+ availableVolumeGroupList.push({"instance": volumeGroupInstance});\r
+ });\r
+\r
+ DataService.setAvailableVolumeGroupList(availableVolumeGroupList);\r
+\r
DataService.setVfModuleInstanceName(vfModule.object[FIELD.ID.VF_MODULE_NAME]);\r
setCurrentServiceModelInfoFromScope();\r
\r
else {\r
$scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {\r
componentId: COMPONENT.VF_MODULE,\r
+ volumeGroups: vfModule.volumeGroups,\r
callbackFunction: deleteOrResumeCallback,\r
dialogMethod: COMPONENT.RESUME\r
});\r
$scope.currentPageNum=1;\r
$scope.isSpinnerVisible = false;\r
$scope.isProgressVisible = false;\r
- if (sessionStorage.getItem("searchKey")!='undefined' && ($scope.rememberFilter)) {\r
+ var searchKey = sessionStorage.getItem("searchKey");\r
+ if (searchKey != 'undefined' && searchKey!=null && ($scope.rememberFilter)) {\r
var searchKey = JSON.parse(sessionStorage.getItem("searchKey"));\r
$scope.searchString = searchKey.searchString || '';\r
$scope.viewPerPage = searchKey.viewPerPage || defaultViewPerPage;\r
DataService.setShouldIncludeInAsyncInstantiationFlow(shouldTakeTheAsyncInstantiationFlow);\r
\r
DataService.setALaCarte (true);\r
- DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));\r
+ DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));\r
$scope.createType = COMPONENT.A_LA_CARTE;\r
var broadcastType = COMPONENT.CREATE_COMPONENT;\r
if (AsdcService.isMacro(serviceModel) || DataService.getE2EService()) {\r
$scope.isConfigurationDataAvailiable = function (configuration) {\r
$log.debug(configuration);\r
return configuration.configData && (!configuration.configData.errorDescription);\r
- }\r
+ };\r
+\r
+ $scope.allowConfigurationActions = function (configuration) {\r
+ $log.debug(configuration);\r
+ return configuration.nodeStatus &&\r
+ _.some(\r
+ [FIELD.STATUS.AAI_ACTIVE, FIELD.STATUS.AAI_INACTIVE, FIELD.STATUS.AAI_CREATED],\r
+ function (s) {\r
+ return s.toLowerCase() === configuration.nodeStatus.toLowerCase();\r
+ });\r
+ };\r
\r
$scope.isActivateDeactivateEnabled = function(btnType) {\r
if ($scope.serviceOrchestrationStatus) {\r
\r
$scope.isResumeShown = function (status) {\r
var vfModuleStatus = status.toLowerCase();\r
- var serviceStatus = $scope.serviceOrchestrationStatus && $scope.serviceOrchestrationStatus.toLowerCase();\r
- return _.includes(['pendingactivation', 'assigned'], vfModuleStatus) && !$scope.isActivateDeactivateEnabled("activate");\r
+ var vfModuleStatusHasAllowedResume = ['pendingactivation', 'assigned'];\r
+ if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_VF_MODULE_RESUME_STATUS_CREATE)) {\r
+ vfModuleStatusHasAllowedResume.push('created');\r
+ }\r
+ return _.includes(vfModuleStatusHasAllowedResume, vfModuleStatus) && !$scope.isActivateDeactivateEnabled("activate");\r
};\r
\r
$scope.handleInitialResponseInventoryItems = function (response) {\r
if( !$scope.hasFabricConfigurations ) {\r
portMirroringConfigurationIds.push(configObject[FIELD.ID.CONFIGURATION_ID]);\r
$scope.service.instance[FIELD.ID.CONFIGURATIONS].push(config);\r
- $scope.allowConfigurationActions = [FIELD.STATUS.AAI_ACTIVE, FIELD.STATUS.AAI_INACTIVE, FIELD.STATUS.AAI_CREATED].indexOf(config.nodeStatus) != -1;\r
} else {\r
if (config.nodeStatus.toLowerCase() !== FIELD.STATUS.ASSIGNED.toLowerCase()) {\r
$scope.allConfigurationsAssigned = false;\r
"use strict";
-var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $timeout, $log,
- DeleteResumeService, CreationService, DataService, UtilityService) {
+var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $timeout, $log, DataService,
+ DeleteResumeService, CreationService, UtilityService) {
$scope.isDialogVisible = false;
$scope.summaryControl = {};
var callbackFunction = undefined;
var componentId = undefined;
+ var volumeGroups = undefined;
$scope.dialogMethod = COMPONENT.DELETE;
$scope.$on(COMPONENT.DELETE_RESUME_COMPONENT, function(event, request) {
- $scope.isE2EService = false;
+ $scope.isE2EService = false;
$scope.isDataVisible = false;
$scope.isSpinnerVisible = false;
$scope.isErrorVisible = false;
$scope.serviceStatus = request.serviceStatus;
callbackFunction = request.callbackFunction;
componentId = request.componentId;
-
+ volumeGroups = request.volumeGroups ? request.volumeGroups : [];
DeleteResumeService.initializeComponent(request.componentId);
$scope.componentName = DeleteResumeService.getComponentDisplayName();
CreationService.initializeComponent(componentId);
CreationService.setInventoryInfo();
- var requestDetails = CreationService.getMsoRequestDetails($scope.userProvidedControl.getList());
+ var parameterList = $scope.userProvidedControl.getList();
+
+ if (volumeGroups && volumeGroups.length > 0) {
+ var volumeGroupList = FIELD.PARAMETER.AVAILABLE_VOLUME_GROUP;
+ volumeGroupList.value = _.map(volumeGroups, function (volumeGroup) {
+ return volumeGroup.name;
+ });
+ parameterList.push(volumeGroupList);
+ }
+ var requestDetails = CreationService.getMsoRequestDetails(parameterList);
$scope.$broadcast(COMPONENT.MSO_CREATE_REQ, {
url : CreationService.getMsoUrl(),
}
appDS2.controller("deleteResumeDialogController", [ "COMPONENT", "FIELD", "$scope", "$http",
- "$timeout", "$log", "DeleteResumeService","CreationService", "DataService", "UtilityService",
+ "$timeout", "$log", "DataService", "DeleteResumeService","CreationService", "UtilityService",
deleteResumeDialogController]);
};
vm.isEnvActive = function(testEnv) {
- return testEnv.operationalEnvironmentStatus==='Activate';
+ return testEnv.operationalEnvironmentStatus==='ACTIVE';
};
vm.getEnvStatus = function (testEnv) {
- return this.isEnvActive(testEnv) ? "Active" : "Inactive";
+ return testEnv.operationalEnvironmentStatus;
};
vm.createNewTestEnvironment = function() {
'use strict';
appDS2.controller("newTestEnvironmentModalController", ["$uibModalInstance", "$uibModal", "AaiService", "TestEnvironmentsService","OwningEntityService",
- "$log", "$scope", "_", "COMPONENT","$rootScope", newTestEnvironmentsModalController]);
+ "$log", "$scope", "_", "COMPONENT","$rootScope", "featureFlags", newTestEnvironmentsModalController]);
- function newTestEnvironmentsModalController($uibModalInstance, $uibModal, AaiService, TestEnvironmentsService,OwningEntityService, $log, $scope, _, COMPONENT, $rootScope) {
+ function newTestEnvironmentsModalController($uibModalInstance, $uibModal, AaiService, TestEnvironmentsService, OwningEntityService, $log, $scope, _, COMPONENT, $rootScope, featureFlags ) {
var vm = this;
vm.newEnvironment = {};
+ vm.releaseVersions = {};
var init = function () {
vm.newEnvironment.operationalEnvironmentType = "VNF";
};
var loadEcompEnvironmentsList = function () {
- TestEnvironmentsService.loadAAIestEnvironments("ECOMP")
+ TestEnvironmentsService.loadAAIestEnvironments("ONAP")
.then(function(response) {
vm.environments = response.operationalEnvironment;
})
var loadCategoryParameters = function () {
OwningEntityService.getOwningEntityProperties(function(response){
- vm.environmentsTypesList = response["operational-environment-type"].map(function (x){
- return x.name;});
- vm.workloadContextList = response["workload-context"].map(function (x){
- return x.name;});
+ vm.environmentsTypesList = response["operational-environment-type"].map(function (environmentType){
+ return environmentType.name;});
+ vm.workloadContextList = response["workload-context"].map(function (context){
+ return context.name;});
+ vm.releaseVersions = response["release"].map(function (releaseOptions){
+ return releaseOptions.name;});
},COMPONENT.TENANT_ISOLATION_FAMILY);
}
vm.createEnvironment = function () {
if($scope.newTestEnvironment.$valid) {
- vm.newEnvironment.workloadContext = vm.newEnvironment.operationalEnvironmentType + '_' + vm.newEnvironment.workloadContext;
var requestDetails = vm.newEnvironment;
+ delete vm.newEnvironment['release'];
$rootScope.$broadcast(COMPONENT.MSO_CREATE_ENVIRONMENT, {
url : COMPONENT.OPERATIONAL_ENVIRONMENT_CREATE,
requestDetails : requestDetails
}
};
-
+ vm.isShowReleaseEnabled = function () {
+ return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1908_RELEASE_TENANT_ISOLATION)
+ };
init();
}
<option data-tests-id="environment-type-option" class="environmentTypeOption" ng-repeat="item in vm.environmentsTypesList" ng-value="item">{{item}}</option>
</select>
</div>
+ <div class="form-group" ng-if="vm.isShowReleaseEnabled()">
+ <label class="control-label" for="operationalEnvironmentType">Release</label>
+ <select class="form-control" ng-class="{'grayedOut': !vm.newEnvironment.operationalEnvironmentType}" ng-model="vm.newEnvironment.release" name="operationalEnvironmentType" id="operationalRelease" data-tests-id="operational-release" required>
+ <option value="" disabled selected hidden>Select release</option>
+ <option data-tests-id="environment-type-option" class="environmentTypeOption" ng-repeat="item in vm.releaseVersions" ng-value="item">{{item}}</option>
+ </select>
+ </div>
<div class="form-group">
<label class="control-label" for="workloadContext">Workload Context</label>
- <select class="form-control" ng-class="{'grayedOut': !vm.newEnvironment.workloadContext}" ng-model="vm.newEnvironment.workloadContext" name="workloadContext" id="workloadContext" data-tests-id="workload-context" required>
+ <select class="form-control" ng-class="{'grayedOut': !vm.newEnvironment.workloadContext}" ng-disabled="vm.isShowReleaseEnabled() && !vm.newEnvironment.release" ng-model="vm.newEnvironment.workloadContext" name="workloadContext" id="workloadContext" data-tests-id="workload-context" required>
<option value="" disabled selected hidden>Select workload context</option>
- <option data-tests-id="workload-context-option" class="workloadContextOption" ng-repeat="item in vm.workloadContextList" ng-value="item">{{vm.newEnvironment.operationalEnvironmentType + '_' + item}}</option>
+ <option data-tests-id="workload-context-option" class="workloadContextOption" ng-repeat="item in vm.workloadContextList" ng-value="item">{{vm.isShowReleaseEnabled() ? vm.newEnvironment.operationalEnvironmentType + '_' + item + '_' + vm.newEnvironment.release : vm.newEnvironment.operationalEnvironmentType + '_' + item }}</option>
</select>
</div>
<div data-tests-id="test-new-environment-error" class="connect-error" ng-if="vm.aaiConnectError">{{vm.aaiConnectError}}</div>
"use strict";
-var vfModuleActionModalController = function(COMPONENT, $scope, $uibModal, CreationService,
+var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal, CreationService,
MsoService, AaiService, DeleteResumeService, DataService, $uibModalInstance, action, vfModule, featureFlags) {
$scope.action = action;
$scope.vfModuleName = vfModule.name;
+ $scope.volumeGroups = vfModule.volumeGroups;
$scope.lcpAndTenant = null;
$scope.regionSelection = {lcpRegion: null, legacyRegion: null, tenant: null};
$scope.lcpRegionList = null;
$scope.isHomingData = false;
- $scope.megaRegion = ['AAIAIC25', 'rdm3', 'rdm5a'];
+ $scope.megaRegion = ['AAIAIC25'];
$scope.isSoftDeleteEnabled = vfModule.nodeStatus.toLowerCase() !== 'assigned' && action === COMPONENT.DELETE;
$scope.isResumeEnabled = action === COMPONENT.RESUME;
$scope.lcpAndTenant = response;
$scope.isFeatureFlagCloudOwner = featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST);
$scope.lcpRegionList = _.uniqBy(response, 'cloudRegionId');
+ $scope.vendorInCloudOwnerRegex = /^[^-]*-/;
});
}
$scope.deleteOrResume = function() {
- var regionSelectionList = [({id: "lcpRegion", value: getLcpRegionId()})];
- regionSelectionList.push({id: "tenant", value: $scope.regionSelection.tenant});
+ var msoParameterList = [({id: "lcpRegion", value: getLcpRegionId()})];
+ msoParameterList.push({id: "tenant", value: $scope.regionSelection.tenant});
var requestParams = {};
var requestDetails;
CreationService.initializeComponent(COMPONENT.VF_MODULE);
CreationService.setInventoryInfo();
- requestDetails = CreationService.getMsoRequestDetails(regionSelectionList);
+ var availableVolumeGroupList = $scope.volumeGroups;
+
+ if (availableVolumeGroupList && availableVolumeGroupList.length > 0) {
+ var volumeGroupList = FIELD.PARAMETER.AVAILABLE_VOLUME_GROUP;
+ volumeGroupList.value = _.map(availableVolumeGroupList, function (volumeGroup) {
+ return volumeGroup.name;
+ });
+ msoParameterList.push(volumeGroupList);
+ }
+
+ requestDetails = CreationService.getMsoRequestDetails(msoParameterList);
requestParams.url = CreationService.getMsoUrl();
msoType = COMPONENT.MSO_CREATE_REQ;
}
else {
DeleteResumeService.initializeComponent(COMPONENT.VF_MODULE);
- requestDetails = DeleteResumeService.getMsoRequestDetails(regionSelectionList);
+ requestDetails = DeleteResumeService.getMsoRequestDetails(msoParameterList);
if(DeleteResumeService.isMacro === true) {
requestDetails.requestParameters.aLaCarte = false;
}
};
-appDS2.controller("vfModuleActionModalController", [ "COMPONENT", "$scope", "$uibModal", "CreationService",
+appDS2.controller("vfModuleActionModalController", [ "COMPONENT", "FIELD", "$scope", "$uibModal", "CreationService",
"MsoService", "AaiService", "DeleteResumeService", "DataService", "$uibModalInstance", "action", "vfModule", "featureFlags",
vfModuleActionModalController ]);
if ( UtilityService.hasContents(globalCustomerId) ) {
$http.get(
COMPONENT.AAI_SUB_DETAILS_PATH
- + globalCustomerId + COMPONENT.ASSIGN + Math.random(),
+ + globalCustomerId + COMPONENT.ASSIGN + Math.random() + COMPONENT.AAI_OMIT_SERVICE_INSTANCES + true,
{
timeout : PropertyService
.getServerResponseTimeoutMsec()
\r
var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCONFIGURATION, COMPONENT, DataService, featureFlags) {\r
var shouldExcludeMacroFromAsyncInstantiationFlow = function(serviceModel){\r
- if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))\r
- return true;\r
- if (DataService.getE2EService())\r
- return true;\r
- if (!_.isEmpty(serviceModel.pnfs))\r
- return true;\r
- if (!_.isEmpty(serviceModel.collectionResource))\r
- return true;\r
- if (!_.isEmpty(serviceModel.networks) && !featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_NETWORK_TO_ASYNC_INSTANTIATION))\r
- return true;\r
- if(serviceModel.service.instantiationType === "ClientConfig")\r
- return true;\r
- return false;\r
+ if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))\r
+ return true;\r
+ if (DataService.getE2EService())\r
+ return true;\r
+ if (!_.isEmpty(serviceModel.pnfs))\r
+ return true;\r
+ if (!_.isEmpty(serviceModel.collectionResources))\r
+ return true;\r
+ if (!_.isEmpty(serviceModel.networks) && !featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_NETWORK_TO_ASYNC_INSTANTIATION))\r
+ return true;\r
+ if(serviceModel.service.instantiationType === "ClientConfig")\r
+ return true;\r
+ return false;\r
};\r
\r
return {\r
getLcpRegionParameter(), FIELD.PARAMETER.LCP_REGION_TEXT_HIDDEN,
FIELD.PARAMETER.TENANT_DISABLED ]);
parameterList = parameterList.concat([ getLineOfBusinessParameter() ]);
+
+
+ if(_this.componentId === COMPONENT.VNF){
+ parameterList[parameterList.length -1].isRequired = true;
+ }
+
parameterList = parameterList.concat([ getPlatformParameter() ]);
+ if(_this.componentId === COMPONENT.NETWORK){
+ parameterList[parameterList.length -1].isRequired = false;
+ }
+
break;
case COMPONENT.VF_MODULE:
parameterList = parameterList.concat([
var lineOfBusiness = getValueFromList(FIELD.ID.LINE_OF_BUSINESS, parameterList);
if(lineOfBusiness) {
- var lineOfBusinessNamesString = _.map(lineOfBusiness, "name").join(", ");
-
requestDetails.lineOfBusiness = {
- lineOfBusinessName: lineOfBusinessNamesString
+ lineOfBusinessName: lineOfBusiness
}
}
}
}
+ var platform = getValueFromList(FIELD.ID.PLATFORM, parameterList);
+ if(platform !== null && platform !== ""){
requestDetails.platform = {
- platformName: getValueFromList(FIELD.ID.PLATFORM, parameterList)
+ platformName: platform
};
+ }
+
+
+
break;
case COMPONENT.VF_MODULE:
requestDetails.requestParameters.usePreload = getValueFromList(
return parameterList[i].value;
}
}
+ return null;
};
var updateUserParameterList = function(updatedId, parameterListControl) {
console.log ("updateUserParameterList() updatedId=" + updatedId);
requestParams.serviceInstanceId,\r
''\r
].join(COMPONENT.FORWARD_SLASH), payload);\r
+ },\r
+ activateFabricConfiguration: function(requestParams) {\r
+ var payload = buildPayloadForActivateFabricConfiguration(requestParams.model, requestParams.userId);\r
+\r
+ var url = COMPONENT.MSO_ACTIVATE_FABRIC_CONFIGURATION_INSTANCE.replace('@serviceInstanceId', requestParams.serviceInstanceId);\r
+ return sendPostRequest(url, payload);\r
+ },\r
+ deactivateAndCloudDelete : function (requestParams) {\r
+ var payload = {\r
+ tenantId: requestParams.tenantId,\r
+ lcpCloudRegionId: requestParams.lcpCloudRegionId,\r
+ userId: requestParams.userId\r
+ };\r
+\r
+ var url = COMPONENT.MSO_DEACTIVATE_AND_CLOUD_DELETE_INSTANCE.replace('@serviceInstanceId', requestParams.serviceInstanceId)\r
+ .replace('@vnfInstanceId', requestParams.vnfInstanceId)\r
+ .replace('@vfModuleInstanceId', requestParams.vfModuleInstanceId);\r
+\r
+ return sendPostRequestWithBody(url, payload);\r
}\r
}\r
};\r
Code Review / vid.git / commitdiff