From: Sébastien Determe <sebastien.determe@intl.att.com>
Date: Fri, 5 Apr 2019 13:35:24 +0000 (+0000)
Subject: Merge "E2E Automation"
X-Git-Tag: 4.0.0~45
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d994b259592d70862d0e0b6c7bd9bf764cbf6ea4;hp=-c;p=clamp.git

Merge "E2E Automation"
---

d994b259592d70862d0e0b6c7bd9bf764cbf6ea4
diff --combined src/main/resources/META-INF/resources/designer/scripts/propertyController.js
index 507d6bc8,6c54a66d..75c64f30
--- a/src/main/resources/META-INF/resources/designer/scripts/propertyController.js
+++ b/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 };