diff options
author | Steve Smokowski <ss835w@att.com> | 2020-03-25 17:27:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-03-25 17:27:49 +0000 |
commit | eb11d1d089cfe5d03e54dee1fced5f96372afe0b (patch) | |
tree | 50f584923c34d56f09c6fae890c9272695ce9a42 /asdc-controller/src | |
parent | 8bc5d2e944f99e705cbf990bb44ce66674ebef98 (diff) | |
parent | e981910b36422a9a7acf5a0ee9c60803f1d113ff (diff) |
Merge "Ingest and Process Service Function"
Diffstat (limited to 'asdc-controller/src')
-rw-r--r-- | asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java | 1 | ||||
-rw-r--r-- | asdc-controller/src/test/resources/schema.sql | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java index 4bc3f884f8..f524b96fa9 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java @@ -1377,6 +1377,7 @@ public class ToscaResourceInstaller { service.setServiceType(serviceMetadata.getValue("serviceType")); service.setServiceRole(serviceMetadata.getValue("serviceRole")); + service.setServiceFunction(serviceMetadata.getValue("serviceFunction")); service.setCategory(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY)); service.setDescription(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)); diff --git a/asdc-controller/src/test/resources/schema.sql b/asdc-controller/src/test/resources/schema.sql index 7ed1e99385..f94f74da97 100644 --- a/asdc-controller/src/test/resources/schema.sql +++ b/asdc-controller/src/test/resources/schema.sql @@ -804,6 +804,7 @@ CREATE TABLE `service` ( `TOSCA_CSAR_ARTIFACT_UUID` varchar(200) DEFAULT NULL, `SERVICE_TYPE` varchar(200) DEFAULT NULL, `SERVICE_ROLE` varchar(200) DEFAULT NULL, + `SERVICE_FUNCTION` varchar(200) DEFAULT NULL, `ENVIRONMENT_CONTEXT` varchar(200) DEFAULT NULL, `WORKLOAD_CONTEXT` varchar(200) DEFAULT NULL, `SERVICE_CATEGORY` varchar(200) DEFAULT NULL, |