Merge "E2E Automation"
authorSébastien Determe <sebastien.determe@intl.att.com>
Fri, 5 Apr 2019 13:35:24 +0000 (13:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 5 Apr 2019 13:35:24 +0000 (13:35 +0000)
1  2 
src/main/resources/META-INF/resources/designer/scripts/propertyController.js

@@@ -72,9 -72,7 +72,9 @@@ function getMsProperty(type) 
      var msProperties = cl_props["microServicePolicies"];
      for (p in msProperties) {
          if (msProperties[p]["name"] == type) {
 -           return JSON.parse(JSON.stringify(msProperties[p]["properties"]));
 +              if (msProperties[p]["properties"] !== null && msProperties[p]["properties"] !== undefined) {
 +                      return JSON.parse(JSON.stringify(msProperties[p]["properties"]));
 +              }
          }
      }
      return null;
@@@ -84,7 -82,7 +84,7 @@@ function getMsUI(type) 
      var msProperties = cl_props["microServicePolicies"];
      for (p in msProperties) {
          if (msProperties[p]["name"] == type) {
 -           return JSON.parse(JSON.stringify(msProperties[p]["jsonRepresentation"]));
 +              return JSON.parse(JSON.stringify(msProperties[p]["jsonRepresentation"]));
          }
      }
      return null;
@@@ -113,4 -111,13 +113,13 @@@ function getDeploymentStatusURL() 
  function setDeploymentStatusURL(deploymentStatusURL) {
      cl_props["dcaeDeploymentStatusUrl"] = deploymentStatusURL;
  }
- module.exports = { getOperationalPolicyProperty,getGlobalProperty,getMsProperty,getMsUI,getLastUpdatedStatus,getDeploymentID,getDeploymentStatusURL };
+ function getResourceDetailsProperty() {
+       return cl_props["modelPropertiesJson"]["resourceDetails"]["VF"];
+ }
+ function getResourceDetailsVfcProperty() {
+       return cl_props["modelPropertiesJson"]["resourceDetails"]["VFC"];
+ }
+ module.exports = { getOperationalPolicyProperty,getGlobalProperty,getMsProperty,getMsUI,getLastUpdatedStatus,getDeploymentID,getDeploymentStatusURL,getResourceDetailsProperty,getResourceDetailsVfcProperty };