summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThamlurRaju <TR00568434@TechMahindra.com>2019-04-19 19:41:09 +0530
committerThamlurRaju <TR00568434@TechMahindra.com>2019-04-19 19:41:09 +0530
commit71b8dc8a2e445d5cfc0a4cffac84c43e61192cad (patch)
treea8a20a61cf07e8b1c9902a9c263b01ea0f15183c
parent786862b40f2baebe5031d4f198bbbce8a9c8add8 (diff)
Replacing the VFC with VFModule
GUI modifications for operation policy Change-Id: I21fd7bc499ba799a0b8436b1946733608d9c62e2 Issue-ID: CLAMP-350 Signed-off-by: ThamlurRaju <TR00568434@TechMahindra.com>
-rw-r--r--src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html5
-rw-r--r--src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js38
-rw-r--r--src/main/resources/META-INF/resources/designer/scripts/propertyController.js6
3 files changed, 25 insertions, 24 deletions
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
index a53ad73d5..b7864eca9 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
@@ -292,7 +292,8 @@ label {
<div class="col-sm-8">
<select class="form-control" name="type" id="type"
ng-click="initTargetResourceId()" ng-model="type">
- <option value="VFC">VFC</option>
+ <option value="">-- choose an option --</option>
+ <option value="VFModule">VFModule</option>
<option value="VM">VM</option>
<option value="VNF">VNF</option>
</select>
@@ -305,7 +306,7 @@ label {
<select class="form-control" name="resourceId" id="resourceId"
enableFilter="true" ng-click="changeTargetResourceId()"
ng-model="resourceId">
- <option value=""></option>
+ <option value="">-- choose an option --</option>
<option value="Other:">Other:</option>
</select>
</div>
diff --git a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
index 4e8855eb0..2c3f83e41 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
@@ -228,7 +228,7 @@ app
$("#resourceId")
.append(
$('<option></option>').val("")
- .html(""));
+ .html("-- choose an option --"));
$("#resourceId").append(
$('<option></option>').val("Other:")
.html("Other:"));
@@ -247,14 +247,14 @@ app
}
}
- var resourceVfc = getResourceDetailsVfcProperty();
- if (type == "VFC"
- && (null !== resourceVfc || undefined !== resourceVfc)) {
+ var resourceVFModule = getResourceDetailsVfModuleProperty();
+ if (type == "VFModule"
+ && (null !== resourceVFModule || undefined !== resourceVFModule)) {
if (recipe == 'VF Module Create'
|| recipe == 'VF Module Delete') {
- for ( var prop in resourceVfc) {
- if (resourceVfc[prop]["isBase"] == false) {
- var name = resourceVfc[prop]["name"];
+ for ( var prop in resourceVFModule) {
+ if (resourceVFModule[prop]["isBase"] == false) {
+ var name = resourceVFModule[prop]["name"];
$("#resourceId").append(
$('<option></option>')
.val(name)
@@ -264,8 +264,8 @@ app
}
else
{
- for ( var prop in resourceVfc) {
- var name = resourceVfc[prop]["name"];
+ for ( var prop in resourceVFModule) {
+ var name = resourceVFModule[prop]["name"];
$("#resourceId").append(
$('<option></option>')
.val(name).html(name));
@@ -280,29 +280,29 @@ app
$("#modelVersionId").val("");
$("#modelVersion").val("");
$("#modelCustomizationId").val("");
- var resourceVfc = getResourceDetailsVfcProperty();
+ var resourceVFModule = getResourceDetailsVfModuleProperty();
var type = $("#type").val();
var recipe = $("#recipe").val();
vfBaseName = $(event.target).val();
- if (type == "VFC"
- && (null !== resourceVfc || undefined !== resourceVfc)
+ if (type == "VFModule"
+ && (null !== resourceVFModule || undefined !== resourceVFModule)
&& (recipe == 'VF Module Create' || recipe == 'VF Module Delete')) {
- for ( var prop in resourceVfc) {
- var name = resourceVfc[prop]["name"];
+ for ( var prop in resourceVFModule) {
+ var name = resourceVFModule[prop]["name"];
if (name == vfBaseName) {
- var vfModuleModelName = resourceVfc[prop]["name"];
+ var vfModuleModelName = resourceVFModule[prop]["name"];
$("#modelName").val(
vfModuleModelName);
- var vfModuleModelInvariantUUID = resourceVfc[prop]["invariantUUID"];
+ var vfModuleModelInvariantUUID = resourceVFModule[prop]["invariantUUID"];
$("#modelInvariantId").val(
vfModuleModelInvariantUUID);
- var vfModuleModelUUID = resourceVfc[prop]["UUID"];
+ var vfModuleModelUUID = resourceVFModule[prop]["UUID"];
$("#modelVersionId").val(
vfModuleModelUUID);
- var vfModuleModelVersion = resourceVfc[prop]["version"];
+ var vfModuleModelVersion = resourceVFModule[prop]["version"];
$("#modelVersion").val(
vfModuleModelVersion);
- var vfModuleModelCustomizationUUID = resourceVfc[prop]["customizationUUID"];
+ var vfModuleModelCustomizationUUID = resourceVFModule[prop]["customizationUUID"];
$("#modelCustomizationId")
.val(
vfModuleModelCustomizationUUID);
diff --git a/src/main/resources/META-INF/resources/designer/scripts/propertyController.js b/src/main/resources/META-INF/resources/designer/scripts/propertyController.js
index 916de678e..3902cf413 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/propertyController.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/propertyController.js
@@ -118,12 +118,12 @@ function getResourceDetailsProperty() {
return cl_props["modelPropertiesJson"]["resourceDetails"]["VF"];
}
-function getResourceDetailsVfcProperty() {
- return cl_props["modelPropertiesJson"]["resourceDetails"]["VFC"];
+function getResourceDetailsVfModuleProperty() {
+ return cl_props["modelPropertiesJson"]["resourceDetails"]["VFModule"];
}
function getLoopLogsArray() {
return cl_props.loopLogs;
}
-module.exports = { getOperationalPolicyProperty,getGlobalProperty,getMsProperty,getMsUI,getLastUpdatedStatus,getDeploymentID,getDeploymentStatusURL,getResourceDetailsProperty,getResourceDetailsVfcProperty }; \ No newline at end of file
+module.exports = { getOperationalPolicyProperty,getGlobalProperty,getMsProperty,getMsUI,getLastUpdatedStatus,getDeploymentID,getDeploymentStatusURL,getResourceDetailsProperty,getResourceDetailsVfModuleProperty }; \ No newline at end of file