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>

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 9eb6c3b..db127f7 100644 (file)
--- 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 55db5e7..0f9b62f 100644 (file)
--- 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 30c0440..fdb1906 100644 (file)
--- 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": "",