diff options
Diffstat (limited to 'common/src/main/java')
5 files changed, 129 insertions, 3 deletions
diff --git a/common/src/main/java/org/onap/so/constants/OrchestrationRequestFormat.java b/common/src/main/java/org/onap/so/constants/OrchestrationRequestFormat.java new file mode 100644 index 0000000000..ccfd2f4de6 --- /dev/null +++ b/common/src/main/java/org/onap/so/constants/OrchestrationRequestFormat.java @@ -0,0 +1,25 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.so.constants; + +public enum OrchestrationRequestFormat { + DETAIL, STATUSDETAIL +} diff --git a/common/src/main/java/org/onap/so/constants/Status.java b/common/src/main/java/org/onap/so/constants/Status.java new file mode 100644 index 0000000000..b460418f0f --- /dev/null +++ b/common/src/main/java/org/onap/so/constants/Status.java @@ -0,0 +1,40 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.so.constants; + + +/* + * Enum for Status values returned by API Handler to Tail-F + */ +public enum Status { + PENDING, + IN_PROGRESS, + COMPLETE, + COMPLETED, + FAILED, + TIMEOUT, + UNLOCKED, + PENDING_MANUAL_TASK, + ABORTED, + ROLLED_BACK, + ROLLED_BACK_TO_ASSIGNED, + ROLLED_BACK_TO_CREATED +} diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java index e236003631..3ada984b58 100644 --- a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java +++ b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java @@ -40,6 +40,36 @@ public class RequestStatus { protected String extSystemErrorSource; @JsonProperty("rollbackExtSystemErrorSource") protected String rollbackExtSystemErrorSource; + @JsonProperty("flowStatus") + protected String flowStatus; + @JsonProperty("retryStatusMessage") + protected String retryStatusMessage; + @JsonProperty("rollbackStatusMessage") + protected String rollbackStatusMessage; + + public String getFlowStatus() { + return flowStatus; + } + + public void setFlowStatus(String flowStatus) { + this.flowStatus = flowStatus; + } + + public String getRetryStatusMessage() { + return retryStatusMessage; + } + + public void setRetryStatusMessage(String retryStatusMessage) { + this.retryStatusMessage = retryStatusMessage; + } + + public String getRollbackStatusMessage() { + return rollbackStatusMessage; + } + + public void setRollbackStatusMessage(String rollbackStatusMessage) { + this.rollbackStatusMessage = rollbackStatusMessage; + } public String getExtSystemErrorSource() { return extSystemErrorSource; @@ -94,6 +124,8 @@ public class RequestStatus { return new ToStringBuilder(this).append("requestState", requestState).append("statusMessage", statusMessage) .append("percentProgress", percentProgress).append("timestamp", timeStamp) .append("extSystemErrorSource", extSystemErrorSource) - .append("rollbackExtSystemErrorSource", rollbackExtSystemErrorSource).toString(); + .append("rollbackExtSystemErrorSource", rollbackExtSystemErrorSource).append("flowStatus", flowStatus) + .append("retryStatusMessage", retryStatusMessage).append("rollbackStatusMessage", rollbackStatusMessage) + .toString(); } } diff --git a/common/src/main/java/org/onap/so/utils/TargetEntities.java b/common/src/main/java/org/onap/so/utils/TargetEntities.java new file mode 100644 index 0000000000..94385ec8ea --- /dev/null +++ b/common/src/main/java/org/onap/so/utils/TargetEntities.java @@ -0,0 +1,25 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.so.utils; + +public interface TargetEntities { + +} diff --git a/common/src/main/java/org/onap/so/utils/TargetEntity.java b/common/src/main/java/org/onap/so/utils/TargetEntity.java index 0f1fe51114..3a3ec91d2f 100644 --- a/common/src/main/java/org/onap/so/utils/TargetEntity.java +++ b/common/src/main/java/org/onap/so/utils/TargetEntity.java @@ -22,7 +22,7 @@ package org.onap.so.utils; import java.util.EnumSet; -public enum TargetEntity { +public enum TargetEntity implements TargetEntities { OPENSTACK_ADAPTER, BPMN, GRM, @@ -37,7 +37,11 @@ public enum TargetEntity { SDC, EXTERNAL, MULTICLOUD, - OOF; + OOF, + SDNC, + SO, + UNKNOWN, + OPENSTACK; private static final String PREFIX = "SO"; |