diff options
| author |   ojasdubey <ojas.dubey@amdocs.com> | 2019-03-18 11:55:56 +0530 |
|---|---|---|
| committer | ojasdubey <ojas.dubey@amdocs.com> | 2019-03-18 12:18:42 +0530 |
| commit | 2ca2fc5c0da1eb862fcd79d1f9345aa89e62b396 (patch) | |
| tree | 15d2cf2c7d6e9024430f735addf9e947d2814830 /catalog-dao/src/main/java | |
| parent | 532b6da80ebd6977aa27300ab3cbe7b21d88609a (diff) | |
Service Consumption BE
1. Service consumption feature
backend implementation
2. Operation output bug fix for
delete operation not allowed for
mapped operation output
Change-Id: Ib2554eed4f940b003955263a0c8bf795a23cac9a
Issue-ID: SDC-1990
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'catalog-dao/src/main/java')
3 files changed, 11 insertions, 8 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ActionStatus.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ActionStatus.java index 15a7fa72c7..49ee297eca 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ActionStatus.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ActionStatus.java @@ -124,14 +124,15 @@ public enum ActionStatus { //InterfaceOperation INTERFACE_OPERATION_NOT_FOUND, INTERFACE_OPERATION_NAME_ALREADY_IN_USE, INTERFACE_OPERATION_NAME_MANDATORY, - INTERFACE_OPERATION_NAME_INVALID, INTERFACE_OPERATION_DESCRIPTION_MAX_LENGTH, INTERFACE_OPERATION_INPUT_NAME_ALREADY_IN_USE, + INTERFACE_OPERATION_NAME_INVALID, INTERFACE_OPERATION_INPUT_NAME_ALREADY_IN_USE, INTERFACE_OPERATION_OUTPUT_NAME_ALREADY_IN_USE, INTERFACE_OPERATION_NOT_DELETED, - INTERFACE_OPERATION_MAPPED_OUTPUT_MODIFIED, + INTERFACE_OPERATION_MAPPED_OUTPUT_MODIFIED, INTERFACE_OPERATION_DELETE_WITH_MAPPED_OUTPUT, INTERFACE_OPERATION_INPUT_NAME_MANDATORY, INTERFACE_OPERATION_OUTPUT_NAME_MANDATORY, INTERFACE_OPERATION_INPUT_PROPERTY_NOT_FOUND_IN_COMPONENT, INTERFACE_OPERATION_INVALID_FOR_LOCAL_TYPE, INTERFACE_OPERATION_INVALID_FOR_GLOBAL_TYPE, PROPERTY_USED_BY_OPERATION, DECLARED_INPUT_USED_BY_OPERATION, + INVALID_CONSUMPTION_TYPE, //NodeFilter NODE_FILTER_NOT_FOUND, UNSUPPORTED_VALUE_PROVIDED, diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java index 119888b10e..2c84f5afbd 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnum.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -50,7 +50,7 @@ public enum EdgeLabelEnum { SERVICE_API_ARTIFACTS, FORWARDING_PATH, CALCULATED_CAPABILITIES, - FULLFILLED_CAPABILITIES, + FULLFILLED_CAPABILITIES, CALCULATED_REQUIREMENTS, FULLFILLED_REQUIREMENTS, LAST_DISTRIBUTION_STATE_MODIFIER, @@ -64,8 +64,9 @@ public enum EdgeLabelEnum { ALLOTTED_OF, INTERFACE, INTERFACE_OPERATION, + INST_INTERFACES, NODE_FILTER_TEMPLATE; - + /** * Returns EdgeLabelEnum according received name * @param name diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java index 9ba7048dd7..288b1ba491 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java @@ -59,9 +59,10 @@ public enum VertexTypeEnum { EXTERNAL_REF ("componentInstanceExtRefs", MapComponentInstanceExternalRefs.class), CATALOG_ROOT ("catalogRoot", null), ARCHIVE_ROOT ("archiveRoot", null), - INTERFACE ("interface", InterfaceDataDefinition.class), + INTERFACE ("interface", InterfaceDataDefinition.class), INTERFACE_OPERATION ("interfaceOperation", OperationDataDefinition.class), - NODE_FILTER_TEMPLATE ("NodeTemplateFilter", CINodeFilterDataDefinition.class),; + NODE_FILTER_TEMPLATE ("NodeTemplateFilter", CINodeFilterDataDefinition.class), + INST_INTERFACES ("InstInterfaces", MapInterfaceDataDefinition.class); private String name; private Class classOfJson; |