diff options
author | Smokowski, Steven <steve.smokowski@att.com> | 2020-03-24 10:28:02 -0400 |
---|---|---|
committer | Benjamin, Max (mb388a) <mb388a@att.com> | 2020-03-24 10:28:04 -0400 |
commit | e981910b36422a9a7acf5a0ee9c60803f1d113ff (patch) | |
tree | 903c4a04cf10ce7a19d237cb8129f1757a34e23e /asdc-controller/src | |
parent | 3b6caf9cc8e1341ea000cb55ae277f622c816dda (diff) |
Ingest and Process Service Function
Intial commit of writing service function to AAI
Update schema.sql table to pass all unit tests
Update local sql to setup CI server for test
Update schema to work and fix passwords
Issue-ID: SO-2763
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I8c517a485841574cde849e1c4e86c3bb7b7dcf89
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, |