aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sebastien.determe@intl.att.com>2019-05-28 16:38:47 +0200
committerDeterme, Sebastien (sd378r) <sebastien.determe@intl.att.com>2019-05-28 16:38:47 +0200
commit2cca1c820e38b45879abe1c82ce994283a55818c (patch)
treeef286a0ab18ccdd891691f1961e8d3c2ca12d5ff /src
parent1021b855c1b605b671d809315308817d5fc33490 (diff)
Fix target Type
Fix target type must be VFMODULE instead of VFModule Issue-ID: CLAMP-395 Change-Id: Ie34422985a13a1f2bc29fb06aceafb3994d2140a Signed-off-by: Determe, Sebastien (sd378r) <sebastien.determe@intl.att.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html2
-rw-r--r--src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js4
-rw-r--r--src/test/resources/tosca/operational-policy-no-guard-properties.json2
3 files changed, 4 insertions, 4 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 9eb6c3b66..db127f7d2 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
@@ -303,7 +303,7 @@ label {
<select class="form-control" name="type" id="type"
ng-click="initTargetResourceId($event)" ng-model="type">
<option value="">-- choose an option --</option>
- <option value="VFModule">VFModule</option>
+ <option value="VFMODULE">VFMODULE</option>
<option value="VM">VM</option>
<option value="VNF">VNF</option>
</select>
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 55db5e798..0f9b62ffe 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
@@ -245,7 +245,7 @@ app
}
}
var resourceVFModule = getResourceDetailsVfModuleProperty();
- if (targetType == "VFModule" && (null !== resourceVFModule || undefined !== resourceVFModule)) {
+ if (targetType == "VFMODULE" && (null !== resourceVFModule || undefined !== resourceVFModule)) {
if (recipe == 'VF Module Create' || recipe == 'VF Module Delete') {
for ( var prop in resourceVFModule) {
if (resourceVFModule[prop]["isBase"] == false) {
@@ -306,7 +306,7 @@ app
var resourceVFModule = getResourceDetailsVfModuleProperty();
var type = $("#formId" + formNum +" #type").val();
var recipe = $("#formId" + formNum +" #recipe").val();
- if (type == "VFModule" && (null !== resourceVFModule || undefined !== resourceVFModule)
+ if (type == "VFMODULE" && (null !== resourceVFModule || undefined !== resourceVFModule)
&& (recipe == 'VF Module Create' || recipe == 'VF Module Delete')) {
for ( var prop in resourceVFModule) {
if (prop == $(event.target).val()) {
diff --git a/src/test/resources/tosca/operational-policy-no-guard-properties.json b/src/test/resources/tosca/operational-policy-no-guard-properties.json
index 30c044044..fdb1906a4 100644
--- a/src/test/resources/tosca/operational-policy-no-guard-properties.json
+++ b/src/test/resources/tosca/operational-policy-no-guard-properties.json
@@ -22,7 +22,7 @@
"failure_guard": "",
"target": {
"type": "VM",
- "resourceId": "",
+ "resourceID": "",
"modelInvariantId": "",
"modelVersionId": "",
"modelName": "",