summaryrefslogtreecommitdiffstats
path: root/controlloop/common/model-impl/sdnr
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-05-08 14:33:57 -0400
committerJim Hahn <jrh3@att.com>2019-05-08 16:24:35 -0400
commit10b21aae2bde224ab7f91f4b5ab1b89369c8fd1c (patch)
tree0417099e379e8be69f90221e8fd066fc40def62b /controlloop/common/model-impl/sdnr
parent01841878936986bc80a974977ccdeaceaf7f9a78 (diff)
Add payload to vFW policy yaml
Added new "streams" payload to vFW policy yaml files. Removed references to pg-streams. Also deleted directories that were moved to policy/models. Also removed references to trafficgenerator. Updated licenses. Removed some trailing whitespace. Change-Id: I6becaa573628eee677f0959fadf86f9a9f032f88 Issue-ID: POLICY-1752 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/model-impl/sdnr')
-rw-r--r--controlloop/common/model-impl/sdnr/pom.xml45
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java264
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java143
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java96
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java159
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseCode.java64
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java91
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java213
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java106
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java115
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/StatusCodeEnum.java90
-rw-r--r--controlloop/common/model-impl/sdnr/src/main/resources/definitions.yaml119
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java144
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java92
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java66
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseCodeTest.java55
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseTest.java117
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseWrapperTest.java66
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java74
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java115
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java215
-rw-r--r--controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java57
22 files changed, 0 insertions, 2506 deletions
diff --git a/controlloop/common/model-impl/sdnr/pom.xml b/controlloop/common/model-impl/sdnr/pom.xml
deleted file mode 100644
index 6515e5186..000000000
--- a/controlloop/common/model-impl/sdnr/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ============LICENSE_START=======================================================
- Drools PDP Application Models
- ================================================================================
- Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
- Modifications Copyright (C) 2018 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=========================================================
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
- <artifactId>model-impl</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>sdnr</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java
deleted file mode 100644
index d9e59ad3b..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-public class PciCommonHeader implements Serializable {
-
- private static final long serialVersionUID = 5435363539127062114L;
-
- @SerializedName(value = "TimeStamp")
- private Instant timeStamp = Instant.now();
-
- @SerializedName(value = "APIVer")
- private String apiVer = "1.0";
-
- @SerializedName(value = "RequestID")
- private UUID requestId;
-
- @SerializedName(value = "SubRequestID")
- private String subRequestId;
-
- @SerializedName(value = "RequestTrack")
- private Map<String, String> requestTrack = new HashMap<>();
-
- @SerializedName(value = "Flags")
- private Map<String, String> flags = new HashMap<>();
-
- public PciCommonHeader() {
-
- }
-
- /**
- * Used to copy a pci common header.
- *
- * @param commonHeader a header that is defined by the Pci api guide that contains information
- * about the request (requestId, flags, etc.)
- */
- public PciCommonHeader(PciCommonHeader commonHeader) {
- this.timeStamp = commonHeader.timeStamp;
- this.requestId = commonHeader.requestId;
- this.subRequestId = commonHeader.subRequestId;
- if (commonHeader.requestTrack != null) {
- this.requestTrack.putAll(commonHeader.requestTrack);
- }
- if (commonHeader.flags != null) {
- this.flags.putAll(commonHeader.flags);
- }
- }
-
- /**
- * Get the timestamp.
- *
- * @return the timeStamp
- */
- public Instant getTimeStamp() {
- return timeStamp;
- }
-
- /**
- * Set the timestamp.
- *
- * @param timeStamp
- * the timeStamp to set
- */
- public void setTimeStamp(Instant timeStamp) {
- this.timeStamp = timeStamp;
- }
-
- /**
- * Get the API version.
- *
- * @return the apiVer
- */
- public String getApiVer() {
- return apiVer;
- }
-
- /**
- * Set the API version.
- *
- * @param apiVer
- * the apiVer to set
- */
- public void setApiVer(String apiVer) {
- this.apiVer = apiVer;
- }
-
- /**
- * Get the request Id.
- *
- * @return the requestId
- */
- public UUID getRequestId() {
- return requestId;
- }
-
- /**
- * Set the request Id.
- *
- * @param requestId
- * the requestId to set
- */
- public void setRequestId(UUID requestId) {
- this.requestId = requestId;
- }
-
- /**
- * Get the sub request Id.
- *
- * @return the subRequestId
- */
- public String getSubRequestId() {
- return subRequestId;
- }
-
- /**
- * Set the sub request Id.
- *
- * @param subRequestId
- * the subRequestId to set
- */
- public void setSubRequestId(String subRequestId) {
- this.subRequestId = subRequestId;
- }
- /**
- * Set the request track.
- *
- * @param requestTrack
- * the requestTrack to set
- */
- public void setRequestTrack(Map<String, String> requestTrack) {
- this.requestTrack = requestTrack;
- }
- /**
- * Get the request track.
- *
- * @return the requestTrack
- */
- public Map<String, String> getRequestTrack() {
- return requestTrack;
- }
-
- /**
- * Get the flags.
- *
- * @return the flags
- */
- public Map<String, String> getFlags() {
- return flags;
- }
-
- /**
- * Set the flags.
- *
- * @param flags
- * the flags to set
- */
- public void setFlags(Map<String, String> flags) {
- this.flags = flags;
- }
-
- @Override
- public String toString() {
- return "CommonHeader [timeStamp=" + timeStamp + ", apiVer=" + apiVer
- + ", requestId=" + requestId + ", subRequestId=" + subRequestId + ", requestTrack=" + requestTrack
- + ", flags=" + flags + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((apiVer == null) ? 0 : apiVer.hashCode());
- result = prime * result + ((flags == null) ? 0 : flags.hashCode());
- result = prime * result + ((requestTrack == null) ? 0 : requestTrack.hashCode());
- result = prime * result + ((requestId == null) ? 0 : requestId.hashCode());
- result = prime * result + ((subRequestId == null) ? 0 : subRequestId.hashCode());
- result = prime * result + ((timeStamp == null) ? 0 : timeStamp.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- PciCommonHeader other = (PciCommonHeader) obj;
- if (apiVer == null) {
- if (other.apiVer != null) {
- return false;
- }
- } else if (!apiVer.equals(other.apiVer)) {
- return false;
- }
- if (flags == null) {
- if (other.flags != null) {
- return false;
- }
- } else if (!flags.equals(other.flags)) {
- return false;
- }
- if (requestTrack == null) {
- if (other.requestTrack != null) {
- return false;
- }
- } else if (!requestTrack.equals(other.requestTrack)) {
- return false;
- }
- if (requestId == null) {
- if (other.requestId != null) {
- return false;
- }
- } else if (!requestId.equals(other.requestId)) {
- return false;
- }
- if (subRequestId == null) {
- if (other.subRequestId != null) {
- return false;
- }
- } else if (!subRequestId.equals(other.subRequestId)) {
- return false;
- }
- if (timeStamp == null) {
- if (other.timeStamp != null) {
- return false;
- }
- } else if (!timeStamp.equals(other.timeStamp)) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java
deleted file mode 100644
index 5155f0b5c..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class PciRequest implements Serializable {
-
- private static final long serialVersionUID = 323235565922846624L;
-
- @SerializedName(value = "CommonHeader")
- private PciCommonHeader commonHeader;
-
- @SerializedName(value = "Action")
- private String action;
-
- @SerializedName(value = "Payload")
- private String payload;
-
- public PciRequest() {
- // Create a default PCI request
- }
-
- public PciCommonHeader getCommonHeader() {
- return commonHeader;
- }
-
- public void setCommonHeader(PciCommonHeader commonHeader) {
- this.commonHeader = commonHeader;
- }
-
- /**
- * Get the action.
- *
- * @return the action
- */
- public String getAction() {
- return action;
- }
-
- /**
- * Set the action.
- *
- * @param action
- * the action to set
- */
- public void setAction(String action) {
- this.action = action;
- }
-
- /**
- * Get the payload.
- *
- * @return the payload
- */
-
- public String getPayload() {
- return payload;
- }
-
- /**
- * Set the payload.
- *
- * @param action
- * the action to set
- */
-
- public void setPayload(String payload) {
- this.payload = payload;
- }
-
- @Override
- public String toString() {
- return "PciRequest[commonHeader=" + commonHeader + ", action=" + action + ", payload=" + payload + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((commonHeader == null) ? 0 : commonHeader.hashCode());
- result = prime * result + ((action == null) ? 0 : action.hashCode());
- result = prime * result + ((payload == null) ? 0 : payload.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- PciRequest other = (PciRequest) obj;
- if (commonHeader == null) {
- if (other.commonHeader != null) {
- return false;
- }
- } else if (!commonHeader.equals(other.commonHeader)) {
- return false;
- }
- if (action == null) {
- if (other.action != null) {
- return false;
- }
- } else if (!action.equals(other.action)) {
- return false;
- }
- if (payload == null) {
- if (other.payload != null) {
- return false;
- }
- } else if (!payload.equals(other.payload)) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java
deleted file mode 100644
index 5a84009c0..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class PciRequestWrapper extends PciWrapper implements Serializable {
-
- private static final long serialVersionUID = 879766924715980798L;
-
- @SerializedName(value = "body")
- private PciRequest body;
-
- public PciRequestWrapper() {
- super();
- }
-
- public PciRequestWrapper(PciRequest request) {
- body = request;
- }
-
- /**
- * Get the body.
- *
- * @return the body
- */
- public PciRequest getBody() {
- return body;
- }
-
- /**
- * Set the body.
- *
- * @param body
- * the body to set
- */
- public void setBody(PciRequest body) {
- this.body = body;
- }
-
- @Override
- public String toString() {
- return "RequestWrapper [body=" + body + ", toString()=" + super.toString() + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((body == null) ? 0 : body.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!super.equals(obj)) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- PciRequestWrapper other = (PciRequestWrapper) obj;
- if (body == null) {
- if (other.body != null) {
- return false;
- }
- } else if (!body.equals(other.body)) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java
deleted file mode 100644
index 21750e1bd..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class PciResponse implements Serializable {
-
- private static final long serialVersionUID = 8375708697287669750L;
-
- @SerializedName(value = "CommonHeader")
- private PciCommonHeader commonHeader;
-
- @SerializedName(value = "Status")
- private Status status = new Status();
-
- @SerializedName(value = "Payload")
- private String payload;
-
- public PciResponse() {
- // EMPTY
- }
-
- /**
- * Constructs a response using the common header of the request since they will
- * be the same.
- *
- * @param request
- * an sdnr Pci request object specified by the Pci api guide
- */
- public PciResponse(PciRequest request) {
- this.commonHeader = new PciCommonHeader(request.getCommonHeader());
-
- }
-
- /**
- * Get the common header.
- *
- * @return the commonHeader
- */
- public PciCommonHeader getCommonHeader() {
- return commonHeader;
- }
-
- /**
- * Set the common header.
- *
- * @param commonHeader
- * the commonHeader to set
- */
- public void setCommonHeader(PciCommonHeader commonHeader) {
- this.commonHeader = commonHeader;
- }
-
- /**
- * Get the status.
- *
- * @return the status
- */
- public Status getStatus() {
- return status;
- }
-
- /**
- * Set the status.
- *
- * @param status
- * the status to set
- */
- public void setStatus(Status status) {
- this.status = status;
- }
-
- /**
- * Get the payload.
- *
- * @return the payload
- */
-
- public String getPayload() {
- return payload;
- }
-
- public void setPayload(String payload) {
- this.payload = payload;
- }
-
- @Override
- public String toString() {
- return "PciResponse[CommonHeader=" + commonHeader + ", Status=" + status + ", Payload="
- + payload + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((commonHeader == null) ? 0 : commonHeader.hashCode());
- result = prime * result + ((payload == null) ? 0 : payload.hashCode());
- result = prime * result + ((status == null) ? 0 : status.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- PciResponse other = (PciResponse) obj;
- if (commonHeader == null) {
- if (other.commonHeader != null) {
- return false;
- }
- } else if (!commonHeader.equals(other.commonHeader)) {
- return false;
- }
- if (payload == null) {
- if (other.payload != null) {
- return false;
- }
- } else if (!payload.equals(other.payload)) {
- return false;
- }
- if (status == null) {
- if (other.status != null) {
- return false;
- }
- } else if (!status.equals(other.status)) {
- return false;
- }
- return true;
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseCode.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseCode.java
deleted file mode 100644
index 430adcb92..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseCode.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd. 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.policy.sdnr;
-
-import java.io.Serializable;
-import org.onap.policy.sdnr.util.StatusCodeEnum;
-
-public class PciResponseCode implements Serializable {
-
- /* These fields define the key to the response code value. */
- public static final String ACCEPTED = "ACCEPTED";
- public static final String ERROR = "ERROR";
- public static final String REJECT = "REJECT";
- public static final String SUCCESS = "SUCCESS";
- public static final String FAILURE = "FAILURE";
- public static final String PARTIAL_SUCCESS = "PARTIAL SUCCESS";
- public static final String PARTIAL_FAILURE = "PARTIAL FAILURE";
- private static final long serialVersionUID = -5371924429933449763L;
-
- private final Integer code;
-
- protected PciResponseCode(final int code) {
- this.code = code;
- }
-
- public int getCode() {
- return this.code;
- }
-
- @Override
- public String toString() {
- return Integer.toString(this.code);
- }
-
- /**
- * Translates the code to a string value that represents the meaning of the code.
- *
- * @param code the numeric value that is returned by SDNR based on success, failure, etc. of the action requested
- * @return the string value equivalent of the SDNR response code
- */
- public static String toResponseValue(int code) {
- StatusCodeEnum statusCodeEnum = StatusCodeEnum.fromStatusCode(code);
- return (statusCodeEnum != null) ? statusCodeEnum.toString() : null;
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java
deleted file mode 100644
index 696d08623..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class PciResponseWrapper extends PciWrapper implements Serializable {
-
- private static final long serialVersionUID = 109837814781086802L;
-
- @SerializedName(value = "body")
- private PciResponse body;
-
- public PciResponseWrapper() {
- super();
- }
-
- /**
- * Get the body.
- *
- * @return the body
- */
- public PciResponse getBody() {
- return body;
- }
-
- /**
- * Set the body.
- *
- * @param body
- * the body to set
- */
- public void setBody(PciResponse body) {
- this.body = body;
- }
-
- @Override
- public String toString() {
- return "ResponseWrapper [body=" + body + ", toString()=" + super.toString() + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((body == null) ? 0 : body.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!super.equals(obj)) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- PciResponseWrapper other = (PciResponseWrapper) obj;
- if (body == null) {
- if (other.body != null) {
- return false;
- }
- } else if (!body.equals(other.body)) {
- return false;
- }
- return true;
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java
deleted file mode 100644
index 456c57877..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class PciWrapper implements Serializable {
-
- private static final long serialVersionUID = 375215806432396532L;
-
- @SerializedName(value = "version")
- private String version;
-
- @SerializedName(value = "cambria-partition")
- private String cambriaPartition;
-
- @SerializedName(value = "rpc-name")
- private String rpcName;
-
- @SerializedName(value = "correlation-id")
- private String correlationId;
-
- @SerializedName(value = "type")
- private String type;
-
- public PciWrapper() {
- // Create a default PciWrapper instance
- }
-
- /**
- * Get the version.
- *
- * @return the version
- */
- public String getVersion() {
- return version;
- }
-
- /**
- * Set the version.
- *
- * @param version
- * the version to set
- */
- public void setVersion(String version) {
- this.version = version;
- }
-
- /**
- * Get the cambria partition.
- *
- * @return the cambriaPartition
- */
- public String getCambriaPartition() {
- return cambriaPartition;
- }
-
- /**
- * Set the cambria partition.
- *
- * @param cambriaPartition
- * the cambriaPartition to set
- */
- public void setCambriaPartition(String cambriaPartition) {
- this.cambriaPartition = cambriaPartition;
- }
-
- /**
- * Get the RPN name.
- *
- * @return the rpcName
- */
- public String getRpcName() {
- return rpcName;
- }
-
- /**
- * Set the RPC name.
- *
- * @param rpcName
- * the rpcName to set
- */
- public void setRpcName(String rpcName) {
- this.rpcName = rpcName;
- }
-
- /**
- * Get the correlation Id.
- *
- * @return the correlationId
- */
- public String getCorrelationId() {
- return correlationId;
- }
-
- /**
- * Set the correclation Id.
- *
- * @param correlationId
- * the correlationId to set
- */
- public void setCorrelationId(String correlationId) {
- this.correlationId = correlationId;
- }
-
- /**
- * Get the type.
- *
- * @return the type
- */
- public String getType() {
- return type;
- }
-
- /**
- * Set the type.
- *
- * @param type
- * the type to set
- */
- public void setType(String type) {
- this.type = type;
- }
-
- @Override
- public String toString() {
- return "Wrapper [version=" + version + ", cambriaPartition=" + cambriaPartition + ", rpcName=" + rpcName
- + ", correlationId=" + correlationId + ", type=" + type + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((cambriaPartition == null) ? 0 : cambriaPartition.hashCode());
- result = prime * result + ((correlationId == null) ? 0 : correlationId.hashCode());
- result = prime * result + ((rpcName == null) ? 0 : rpcName.hashCode());
- result = prime * result + ((type == null) ? 0 : type.hashCode());
- result = prime * result + ((version == null) ? 0 : version.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- PciWrapper other = (PciWrapper) obj;
- if (cambriaPartition == null) {
- if (other.cambriaPartition != null) {
- return false;
- }
- } else if (!cambriaPartition.equals(other.cambriaPartition)) {
- return false;
- }
- if (correlationId == null) {
- if (other.correlationId != null) {
- return false;
- }
- } else if (!correlationId.equals(other.correlationId)) {
- return false;
- }
- if (rpcName == null) {
- if (other.rpcName != null) {
- return false;
- }
- } else if (!rpcName.equals(other.rpcName)) {
- return false;
- }
- if (type == null) {
- if (other.type != null) {
- return false;
- }
- } else if (!type.equals(other.type)) {
- return false;
- }
- if (version == null) {
- if (other.version != null) {
- return false;
- }
- } else if (!version.equals(other.version)) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java
deleted file mode 100644
index dc0295ae1..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-
-public class Status implements Serializable {
-
- private static final long serialVersionUID = 877641506135467199L;
-
- @SerializedName(value = "Code")
- private int code;
-
- @SerializedName(value = "Value")
- private String value;
-
- public Status() {
- // Create a default PciResponseStatus instance
- }
-
- /**
- * Constructor for the class Status.
- *
- */
- public Status(int code, String value) {
- super();
- this.code = code;
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public int getCode() {
- return code;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return "Status [code = " + code + ", value = " + value + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + code;
- result = prime * result + ((value == null) ? 0 : value.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- Status other = (Status) obj;
- if (code != other.code) {
- return false;
- }
- if (value == null) {
- if (other.value != null) {
- return false;
- }
- } else if (!value.equals(other.value)) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java
deleted file mode 100644
index 3a116d741..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2018 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.policy.sdnr.util;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import java.lang.reflect.Type;
-import java.time.Instant;
-
-import org.onap.policy.sdnr.PciRequest;
-import org.onap.policy.sdnr.PciResponse;
-
-
-public final class Serialization {
- public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
- .registerTypeAdapter(Instant.class, new InstantAdapter()).create();
-
- public static final Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
- .registerTypeAdapter(PciRequest.class, new RequestAdapter())
- .registerTypeAdapter(PciResponse.class, new ResponseAdapter()).create();
-
- public static final Gson gsonJunit = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
- .registerTypeAdapter(Instant.class, new InstantJunitAdapter()).create();
-
- private Serialization() {}
-
- public static class RequestAdapter implements JsonSerializer<PciRequest>, JsonDeserializer<PciRequest> {
-
- @Override
- public JsonElement serialize(PciRequest src, Type typeOfSrc, JsonSerializationContext context) {
- JsonElement requestJson = gsonPretty.toJsonTree(src, PciRequest.class);
- JsonObject input = new JsonObject();
- input.add("input", requestJson);
-
- return input;
- }
-
- @Override
- public PciRequest deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return gsonPretty.fromJson(json.getAsJsonObject().get("input"), PciRequest.class);
- }
- }
-
- public static class ResponseAdapter implements JsonSerializer<PciResponse>, JsonDeserializer<PciResponse> {
-
- @Override
- public JsonElement serialize(PciResponse src, Type typeOfSrc, JsonSerializationContext context) {
- JsonElement responseJson = gsonPretty.toJsonTree(src, PciResponse.class);
- JsonObject output = new JsonObject();
- output.add("output", responseJson);
- return output;
- }
-
- @Override
- public PciResponse deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return gsonPretty.fromJson(json.getAsJsonObject().get("output"), PciResponse.class);
- }
- }
-
- public static class InstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
-
- @Override
- public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return Instant.parse(json.getAsString());
- }
-
- @Override
- public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
- return new JsonPrimitive(src.toString());
- }
-
- }
-
- public static class InstantJunitAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
-
- @Override
- public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return Instant.ofEpochMilli(json.getAsLong());
- }
-
- @Override
- public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
- return new JsonPrimitive(src.toEpochMilli());
- }
-
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/StatusCodeEnum.java b/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/StatusCodeEnum.java
deleted file mode 100644
index 8830545da..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/StatusCodeEnum.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Samsung Electronics Co., Ltd. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.sdnr.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum StatusCodeEnum {
- ACCEPTED("ACCEPTED"), ERROR("ERROR"), REJECT("REJECT"), SUCCESS("SUCCESS"), FAILURE("FAILURE"),
- PARTIAL_SUCCESS("PARTIAL SUCCESS"), PARTIAL_FAILURE("PARTIAL FAILURE");
-
- private String name;
-
- StatusCodeEnum(final String name) {
- this.name = name;
- }
-
- public String toString() {
- return this.name;
- }
-
- /**
- * Determine status enum from the code.
- *
- * @param statusCode integer code indicating the status
- * @return enum representation of status code
- */
- public static StatusCodeEnum fromStatusCode(final int statusCode) {
- if (statusCode == 100) {
- return ACCEPTED;
- }
-
- if (statusCode == 200) {
- return SUCCESS;
- }
-
- if (isRejectStatusCode(statusCode)) {
- return REJECT;
- }
-
- if (statusCode == 400) {
- return ERROR;
- }
-
- if (isFailureStatusCode(statusCode)) {
- return FAILURE;
- }
-
- if (statusCode == 500) {
- return PARTIAL_SUCCESS;
- }
-
- if (isPartialFailureStatusCode(statusCode)) {
- return PARTIAL_FAILURE;
- }
-
- return null;
- }
-
- private static boolean isRejectStatusCode(final int statusCode) {
- return statusCode >= 300 && statusCode <= 313;
- }
-
- private static boolean isFailureStatusCode(final int statusCode) {
- return statusCode == 450 || (statusCode >= 401 && statusCode <= 406);
- }
-
- private static boolean isPartialFailureStatusCode(final int statusCode) {
- return statusCode >= 501 && statusCode <= 599;
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/main/resources/definitions.yaml b/controlloop/common/model-impl/sdnr/src/main/resources/definitions.yaml
deleted file mode 100644
index 19c91e50d..000000000
--- a/controlloop/common/model-impl/sdnr/src/main/resources/definitions.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# sdnr
-# ================================================================================
-# Copyright (C) 2018 Wipro Limited 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=========================================================
-###
-
-Request:
- type: object
- properties:
- CommonHeader:
- type: object
- properties:
- TimeStamp:
- type: string
- APIver:
- type: string
- value: '1.01'
- OriginatorID:
- type: string
- RequestID:
- type: string
- pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
- SubRequestID:
- type: string
- Flags:
- type: object
- required:
- - TimeStamp
- - APIver
- - OriginatorID
- - RequestID
- Action:
- type: string
- enum:
- - Audit
- - ActionStatus
- - BlockAudits
- - Configure
- - HealthCheck
- - Install
- - LiveUpgrade
- - Migrate
- - ModifyConfig
- - ModifyConfigANR
- - Query
- - Rebuild
- - Reconfigure
- - Restart
- - Rollback
- - Scale
- - Start
- - Stop
- - Sync
- - Terminate
- - Test
- - Upgrade
- TargetID:
- type: string
- ObjectID:
- type: string
- Payload:
- type: object
- required:
- - CommonHeader
- - Action
- - TargetID
-Response:
- type: object
- properties:
- CommonHeader:
- type: object
- properties:
- TimeStamp:
- type: string
- APIver:
- type: string
- OriginatorID:
- type: string
- RequestID:
- type: string
- SubRequestID:
- type: string
- Flags:
- type: object
- required:
- - TimeStamp
- - APIver
- - OriginatorID
- - RequestID
- Status:
- type: object
- properties:
- Code:
- type: integer
- Value:
- type: string
- required:
- - Code
- - Value
- Payload:
- type: object
- required:
- - CommonHeader
- - Status
-
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java
deleted file mode 100644
index 4b3201440..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.Test;
-
-public class PciCommonHeaderTest {
-
- @Test
- public void testPciCommonHeader() {
- PciCommonHeader commonHeader = new PciCommonHeader();
- assertNotNull(commonHeader);
- assertNotNull(new PciCommonHeader(commonHeader));
- assertNotEquals(0, commonHeader.hashCode());
-
- commonHeader.setApiVer("Kansas");
- assertEquals("Kansas", commonHeader.getApiVer());
-
- Map<String, String> flagMap = new HashMap<>();
- commonHeader.setFlags(flagMap);
- assertEquals(flagMap, commonHeader.getFlags());
-
- Map<String, String> requestMap = new HashMap<>();
- commonHeader.setRequestTrack(requestMap);
- assertEquals(requestMap, commonHeader.getRequestTrack());
-
- UUID requestId = UUID.randomUUID();
- commonHeader.setRequestId(requestId);
- assertEquals(requestId, commonHeader.getRequestId());
-
- commonHeader.setSubRequestId("Can I go home?");
- assertEquals("Can I go home?", commonHeader.getSubRequestId());
-
- Instant timestamp = Instant.now();
- commonHeader.setTimeStamp(timestamp);
- assertEquals(timestamp, commonHeader.getTimeStamp());
-
- assertNotEquals(0, commonHeader.hashCode());
-
- assertEquals("CommonHeader [timeStamp=", commonHeader.toString().substring(0, 24));
-
- PciCommonHeader copiedPciCommonHeader = new PciCommonHeader();
- copiedPciCommonHeader.setApiVer(commonHeader.getApiVer());
- copiedPciCommonHeader.setFlags(commonHeader.getFlags());
- copiedPciCommonHeader.setRequestId(commonHeader.getRequestId());
- copiedPciCommonHeader.setSubRequestId(commonHeader.getSubRequestId());
- copiedPciCommonHeader.setTimeStamp(commonHeader.getTimeStamp());
-
- assertTrue(commonHeader.equals(commonHeader));
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- assertFalse(commonHeader.equals(null));
- assertFalse(commonHeader.equals("Hello"));
-
- PciCommonHeader clonedPciCommonHeader = new PciCommonHeader(commonHeader);
- clonedPciCommonHeader.setApiVer(commonHeader.getApiVer());
- clonedPciCommonHeader.setTimeStamp(commonHeader.getTimeStamp());
-
- assertTrue(commonHeader.equals(clonedPciCommonHeader));
-
- commonHeader.setApiVer(null);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setApiVer(null);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setApiVer("Kansas");
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setApiVer("Kansas");
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
-
- commonHeader.setFlags(null);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setFlags(null);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setFlags(flagMap);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setFlags(flagMap);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
-
- commonHeader.setRequestTrack(null);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setRequestTrack(null);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setRequestTrack(requestMap);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setRequestTrack(requestMap);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
-
-
- commonHeader.setRequestId(null);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setRequestId(null);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setRequestId(requestId);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setRequestId(requestId);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
-
- commonHeader.setSubRequestId(null);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setSubRequestId(null);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setSubRequestId("Can I go home?");
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setSubRequestId("Can I go home?");
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
-
- commonHeader.setTimeStamp(null);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setTimeStamp(null);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setTimeStamp(timestamp);
- assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setTimeStamp(timestamp);
- assertTrue(commonHeader.equals(copiedPciCommonHeader));
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java
deleted file mode 100644
index 64d976710..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class PciRequestTest {
-
- @Test
- public void testPciRequest() {
- PciRequest request = new PciRequest();
- assertNotNull(request);
- assertNotEquals(0, request.hashCode());
-
- PciCommonHeader commonHeader = new PciCommonHeader();
- String requestPayload = "";
-
- request.setCommonHeader(commonHeader);
- assertEquals(commonHeader, request.getCommonHeader());
-
- request.setPayload(requestPayload);
- assertEquals(requestPayload, request.getPayload());
-
- request.setAction("Modify");
- assertEquals("Modify", request.getAction());
-
- assertNotEquals(0, request.hashCode());
-
- assertEquals("PciRequest[commonHeader=CommonHeader [timeStamp=", request.toString().substring(0, 48));
-
- PciRequest copiedPciRequest = new PciRequest();
- copiedPciRequest.setCommonHeader(request.getCommonHeader());
- copiedPciRequest.setAction(request.getAction());
- copiedPciRequest.setPayload(request.getPayload());
-
- assertTrue(request.equals(request));
- assertTrue(request.equals(copiedPciRequest));
- assertFalse(request.equals(null));
- assertFalse(request.equals("Hello"));
-
- request.setCommonHeader(null);
- assertFalse(request.equals(copiedPciRequest));
- copiedPciRequest.setCommonHeader(null);
- assertTrue(request.equals(copiedPciRequest));
- request.setCommonHeader(commonHeader);
- assertFalse(request.equals(copiedPciRequest));
- copiedPciRequest.setCommonHeader(commonHeader);
- assertTrue(request.equals(copiedPciRequest));
-
- request.setAction(null);
- assertFalse(request.equals(copiedPciRequest));
- copiedPciRequest.setAction(null);
- assertTrue(request.equals(copiedPciRequest));
- request.setAction("Modify");
- assertFalse(request.equals(copiedPciRequest));
- copiedPciRequest.setAction("Modify");
- assertTrue(request.equals(copiedPciRequest));
-
- request.setPayload(null);
- assertFalse(request.equals(copiedPciRequest));
- copiedPciRequest.setPayload(null);
- assertTrue(request.equals(copiedPciRequest));
- request.setPayload(requestPayload);
- assertFalse(request.equals(copiedPciRequest));
- copiedPciRequest.setPayload(requestPayload);
- assertTrue(request.equals(copiedPciRequest));
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java
deleted file mode 100644
index 79f3c0d6f..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class PciRequestWrapperTest {
-
- @Test
- public void testPciRequestWrapperWrapper() {
- assertNotNull(new PciRequestWrapper(new PciRequest()));
- PciRequestWrapper requestWrapper = new PciRequestWrapper();
- assertNotNull(requestWrapper);
- assertNotEquals(0, requestWrapper.hashCode());
-
- PciRequest request = new PciRequest();
-
- requestWrapper.setBody(request);
- assertEquals(request, requestWrapper.getBody());
-
- assertNotEquals(0, requestWrapper.hashCode());
-
- assertEquals("RequestWrapper [body=PciRequest[commonHeader=nul", requestWrapper.toString().substring(0, 48));
-
- PciRequestWrapper copiedPciRequestWrapper = new PciRequestWrapper();
- copiedPciRequestWrapper.setBody(requestWrapper.getBody());
-
- assertTrue(requestWrapper.equals(requestWrapper));
- assertTrue(requestWrapper.equals(copiedPciRequestWrapper));
- assertFalse(requestWrapper.equals(null));
- assertFalse(requestWrapper.equals("Hello"));
-
- requestWrapper.setBody(null);
- assertFalse(requestWrapper.equals(copiedPciRequestWrapper));
- copiedPciRequestWrapper.setBody(null);
- assertTrue(requestWrapper.equals(copiedPciRequestWrapper));
- requestWrapper.setBody(request);
- assertFalse(requestWrapper.equals(copiedPciRequestWrapper));
- copiedPciRequestWrapper.setBody(request);
- assertTrue(requestWrapper.equals(copiedPciRequestWrapper));
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseCodeTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseCodeTest.java
deleted file mode 100644
index 355713133..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseCodeTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-
-public class PciResponseCodeTest {
-
- @Test
- public void testPciResponseCode() {
- assertNull(PciResponseCode.toResponseValue(0));
-
- assertEquals(PciResponseCode.ACCEPTED, PciResponseCode.toResponseValue(100));
- assertEquals(PciResponseCode.SUCCESS, PciResponseCode.toResponseValue(200));
- assertEquals(PciResponseCode.REJECT, PciResponseCode.toResponseValue(300));
- assertEquals(PciResponseCode.ERROR, PciResponseCode.toResponseValue(400));
- assertEquals(PciResponseCode.FAILURE, PciResponseCode.toResponseValue(450));
- assertEquals(PciResponseCode.FAILURE, PciResponseCode.toResponseValue(401));
- assertEquals(PciResponseCode.FAILURE, PciResponseCode.toResponseValue(406));
- assertEquals(PciResponseCode.PARTIAL_SUCCESS, PciResponseCode.toResponseValue(500));
- assertEquals(PciResponseCode.PARTIAL_FAILURE, PciResponseCode.toResponseValue(501));
- assertEquals(PciResponseCode.PARTIAL_FAILURE, PciResponseCode.toResponseValue(599));
-
- assertEquals("100", new PciResponseCode(100).toString());
- assertEquals("200", new PciResponseCode(200).toString());
- assertEquals("300", new PciResponseCode(300).toString());
- assertEquals("400", new PciResponseCode(400).toString());
- assertEquals("450", new PciResponseCode(450).toString());
- assertEquals("500", new PciResponseCode(500).toString());
- assertEquals("510", new PciResponseCode(510).toString());
-
- assertEquals(300, new PciResponseCode(300).getCode());
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseTest.java
deleted file mode 100644
index 52137ef7d..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class PciResponseTest {
-
- Status status = new Status(0, "");
-
- String responsePayload = "";
- String requestPayload = "";
-
-
- @Test
- public void testHashCode() {
- PciResponse response = new PciResponse();
- assertTrue(response.hashCode() != 0);
- response.setCommonHeader(new PciCommonHeader());
- assertTrue(response.hashCode() != 0);
- response.setPayload(responsePayload);
- assertTrue(response.hashCode() != 0);
- response.setStatus(null);
- assertTrue(response.hashCode() != 0);
- }
-
- @Test
- public void testPciResponse() {
- PciResponse response = new PciResponse();
- assertNull(response.getCommonHeader());
- assertNull(response.getPayload());
- assertNotNull(response.getStatus());
- }
-
- @Test
- public void testToString() {
- PciResponse response = new PciResponse();
- assertFalse(response.toString().isEmpty());
- }
-
- @Test
- public void testEqualsObject() {
- PciResponse response = new PciResponse();
- assertTrue(response.equals(response));
- assertFalse(response.equals(null));
- assertFalse(response.equals(new Object()));
-
- PciResponse response2 = new PciResponse();
- assertTrue(response.equals(response2));
-
- response.setCommonHeader(new PciCommonHeader());
- assertFalse(response.equals(response2));
- response2.setCommonHeader(response.getCommonHeader());
- assertTrue(response.equals(response2));
-
- response.setPayload(responsePayload);
- assertFalse(response.equals(response2));
- response2.setPayload(response.getPayload());
- assertTrue(response.equals(response2));
-
- response.setCommonHeader(null);
- assertFalse(response.equals(response2));
- response2.setCommonHeader(null);
- assertTrue(response.equals(response2));
-
- response.setPayload(null);
- assertFalse(response.equals(response2));
- response2.setPayload(response.getPayload());
- assertTrue(response.equals(response2));
-
- response.setStatus(null);
- assertFalse(response.equals(response2));
- response2.setStatus(response.getStatus());
- assertTrue(response.equals(response2));
-
- Status status = new Status();
- status.setCode(5);
- response.setStatus(status);
- response2.setStatus(new Status());
- assertFalse(response.equals(response2));
- }
-
- @Test
- public void testResponseRequest() {
- PciRequest request = new PciRequest();
- request.setCommonHeader(new PciCommonHeader());
- request.setPayload(requestPayload);
-
- PciResponse response = new PciResponse(request);
-
- assertTrue(response.getCommonHeader().equals(request.getCommonHeader()));
- }
-
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseWrapperTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseWrapperTest.java
deleted file mode 100644
index 16f6f59e9..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseWrapperTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class PciResponseWrapperTest {
-
- @Test
- public void testPciResponseWrapperWrapper() {
-
- PciResponseWrapper responseWrapper = new PciResponseWrapper();
- assertNotNull(responseWrapper);
- assertNotEquals(0, responseWrapper.hashCode());
-
- PciResponse response = new PciResponse();
-
- responseWrapper.setBody(response);
- assertEquals(response, responseWrapper.getBody());
-
- assertNotEquals(0, responseWrapper.hashCode());
-
- assertNotEquals("ResponseWrapper [body=Response [commonHeader=n", responseWrapper.toString().substring(0, 46));
-
- PciResponseWrapper copiedPciResponseWrapper = new PciResponseWrapper();
- copiedPciResponseWrapper.setBody(responseWrapper.getBody());
-
- assertTrue(responseWrapper.equals(responseWrapper));
- //assertTrue(responseWrapper.equals(copiedPciResponseWrapper));
- assertFalse(responseWrapper.equals(null));
- assertFalse(responseWrapper.equals("Hello"));
-
- responseWrapper.setBody(null);
- assertFalse(responseWrapper.equals(copiedPciResponseWrapper));
- copiedPciResponseWrapper.setBody(null);
- //assertTrue(responseWrapper.equals(copiedPciResponseWrapper));
- responseWrapper.setBody(response);
- //assertFalse(responseWrapper.equals(copiedPciResponseWrapper));
- copiedPciResponseWrapper.setBody(response);
- //assertTrue(responseWrapper.equals(copiedPciResponseWrapper));
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java
deleted file mode 100644
index b38eed3e3..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class PciStatusTest {
-
- @Test
- public void testResponseStatus() {
- Status status = new Status();
- assertNotNull(status);
- assertNotEquals(0, status.hashCode());
-
- status.setCode(1234);
- assertEquals(1234, status.getCode());
-
- status.setValue("The wonderful land of Oz");
- assertEquals("The wonderful land of Oz", status.getValue());
-
- assertEquals("Status [code = 1234, value = The wonderfu", status.toString().substring(0, 41));
-
- Status copiedStatus = new Status();
- copiedStatus.setCode(status.getCode());
- copiedStatus.setValue(status.getValue());
-
- assertTrue(status.equals(status));
- assertTrue(status.equals(copiedStatus));
- assertFalse(status.equals(null));
- assertFalse(status.equals("Hello"));
-
- status.setCode(-1);
- assertFalse(status.equals(copiedStatus));
- copiedStatus.setCode(-1);
- assertTrue(status.equals(copiedStatus));
- status.setCode(1234);
- assertFalse(status.equals(copiedStatus));
- copiedStatus.setCode(1234);
- assertTrue(status.equals(copiedStatus));
-
- status.setValue(null);
- assertFalse(status.equals(copiedStatus));
- copiedStatus.setValue(null);
- assertTrue(status.equals(copiedStatus));
- status.setValue("The wonderful land of Oz");
- assertFalse(status.equals(copiedStatus));
- copiedStatus.setValue("The wonderful land of Oz");
- assertTrue(status.equals(copiedStatus));
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java
deleted file mode 100644
index a9501dddc..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class PciWrapperTest {
-
- @Test
- public void testPciWrapper() {
- PciWrapper wrapper = new PciWrapper();
- assertNotNull(wrapper);
- assertNotEquals(0, wrapper.hashCode());
-
- wrapper.setVersion("19.3.9");
- assertEquals("19.3.9", wrapper.getVersion());
-
- wrapper.setCambriaPartition("The Emerald City");
- assertEquals("The Emerald City", wrapper.getCambriaPartition());
-
- wrapper.setRpcName("Tornado");
- assertEquals("Tornado", wrapper.getRpcName());
-
- wrapper.setCorrelationId("YellowBrickRoad");
- assertEquals("YellowBrickRoad", wrapper.getCorrelationId());
-
- wrapper.setType("Munchkin");
- assertEquals("Munchkin", wrapper.getType());
-
- assertNotEquals(0, wrapper.hashCode());
-
- assertEquals("Wrapper [version=19.3.9, cambriaPartition=The ", wrapper.toString().substring(0, 46));
-
- PciWrapper copiedPciWrapper = new PciWrapper();
- copiedPciWrapper.setVersion(wrapper.getVersion());
- copiedPciWrapper.setCambriaPartition(wrapper.getCambriaPartition());
- copiedPciWrapper.setRpcName(wrapper.getRpcName());
- copiedPciWrapper.setCorrelationId(wrapper.getCorrelationId());
- copiedPciWrapper.setType(wrapper.getType());
-
- assertTrue(wrapper.equals(wrapper));
- assertTrue(wrapper.equals(copiedPciWrapper));
- assertFalse(wrapper.equals(null));
- assertFalse(wrapper.equals("Hello"));
-
- wrapper.setVersion(null);
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setVersion(null);
- assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setVersion("19.3.9");
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setVersion("19.3.9");
- assertTrue(wrapper.equals(copiedPciWrapper));
-
- wrapper.setCambriaPartition(null);
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setCambriaPartition(null);
- assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setCambriaPartition("The Emerald City");
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setCambriaPartition("The Emerald City");
- assertTrue(wrapper.equals(copiedPciWrapper));
-
- wrapper.setRpcName(null);
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setRpcName(null);
- assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setRpcName("Tornado");
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setRpcName("Tornado");
- assertTrue(wrapper.equals(copiedPciWrapper));
-
- wrapper.setCorrelationId(null);
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setCorrelationId(null);
- assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setCorrelationId("YellowBrickRoad");
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setCorrelationId("YellowBrickRoad");
- assertTrue(wrapper.equals(copiedPciWrapper));
-
- wrapper.setType(null);
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setType(null);
- assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setType("Munchkin");
- assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setType("Munchkin");
- assertTrue(wrapper.equals(copiedPciWrapper));
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java
deleted file mode 100644
index f975e5575..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.UUID;
-
-import org.junit.Test;
-import org.onap.policy.sdnr.util.Serialization;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SdnrTest {
-
- private static final Logger logger = LoggerFactory.getLogger(SdnrTest.class);
-
- private static PciRequestWrapper dmaapRequest;
- private static PciResponseWrapper dmaapResponse;
-
- static {
- /*
- * Construct an SDNR Request to be Serialized
- */
- dmaapRequest = new PciRequestWrapper();
- dmaapRequest.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1");
- dmaapRequest.setRpcName("restart");
- dmaapRequest.setType("request");
-
- dmaapResponse = new PciResponseWrapper();
- dmaapResponse.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1");
- dmaapResponse.setRpcName("restart");
- dmaapResponse.setType("response");
-
- PciRequest sdnrRequest = new PciRequest();
-
- sdnrRequest.setAction("ModifyConfig");
-
- PciCommonHeader commonHeader = new PciCommonHeader();
- commonHeader.setRequestId(UUID.fromString("664be3d2-6c12-4f4b-a3e7-c349acced200"));
- commonHeader.setSubRequestId("1");
-
- sdnrRequest.setCommonHeader(commonHeader);
-
- sdnrRequest.setPayload(null);
-
- dmaapRequest.setBody(sdnrRequest);
-
- /*
- * Construct an SDNR Response to be Serialized
- */
- PciResponse sdnrResponse = new PciResponse(sdnrRequest);
- sdnrResponse.getStatus().setCode(400);
- sdnrResponse.getStatus().setValue("Restart Successful");
- sdnrResponse.setPayload(null);
-
- dmaapResponse.setBody(sdnrResponse);
- }
-
- @Test
- public void testRequestSerialization() {
-
- /*
- * Use the gson serializer to obtain json
- */
- String jsonRequest = Serialization.gson.toJson(dmaapRequest, PciRequestWrapper.class);
- assertNotNull(jsonRequest);
-
- /*
- * The serializer should have added an extra sub-tag called "input" that wraps the request
- */
- assertTrue(jsonRequest.contains("input"));
-
- /*
- * The common-header, request-id, and sub-request-id should exist
- */
- assertTrue(jsonRequest.contains("CommonHeader"));
- assertTrue(jsonRequest.contains("RequestID"));
- assertTrue(jsonRequest.contains("SubRequestID"));
-
- /*
- * The action sub-tag should exist
- */
- assertTrue(jsonRequest.contains("Action"));
-
- logger.debug("Request as JSON: " + jsonRequest + "\n\n");
- }
-
- @Test
- public void testRequestDeserialization() {
-
- /*
- * Convert the PCI request object into json so we have a string of json to use for testing
- */
- String jsonRequest = Serialization.gson.toJson(dmaapRequest, PciRequestWrapper.class);
-
- /*
- * Use the serializer to convert the json string into a java object
- */
- PciRequestWrapper pciRequestWrapper = Serialization.gson.fromJson(jsonRequest, PciRequestWrapper.class);
- assertNotNull(pciRequestWrapper);
- assertEquals(dmaapRequest, pciRequestWrapper);
-
- /*
- * The type of the DMAAP wrapper should be request
- */
- assertEquals("request", dmaapRequest.getType());
-
- /*
- * The DMAAP wrapper must have a body as that is the true SDNR request
- */
- assertNotNull(dmaapRequest.getBody());
- PciRequest sdnrRequest = dmaapRequest.getBody();
- assertNotNull(sdnrRequest);
-
- /*
- * The common header should not be null
- */
- assertNotNull(sdnrRequest.getCommonHeader());
-
- /*
- * The action should not be null and should be set to restart
- */
- assertNotNull(sdnrRequest.getAction());
- assertEquals("ModifyConfig", sdnrRequest.getAction());
-
- logger.debug("Request as a Java Object: \n" + sdnrRequest.toString() + "\n\n");
- }
-
- @Test
- public void testResponseSerialization() {
-
- /*
- * Use the serializer to convert the object into json
- */
- String jsonResponse = Serialization.gson.toJson(dmaapResponse, PciResponseWrapper.class);
- assertNotNull(jsonResponse);
-
- /*
- * The serializer should have added an extra sub-tag called "input" that wraps the request
- */
- assertTrue(jsonResponse.contains("output"));
-
- /*
- * The response should contain a common-header, request-id, sub-request-id, and status
- */
- assertTrue(jsonResponse.contains("CommonHeader"));
- assertTrue(jsonResponse.contains("RequestID"));
- assertTrue(jsonResponse.contains("SubRequestID"));
- assertTrue(jsonResponse.contains("Status"));
-
- logger.debug("Response as JSON: " + jsonResponse + "\n\n");
- }
-
- @Test
- public void testResponseDeserialization() {
- /*
- * Convert the PCI response object into json so we have a string of json to use for testing
- */
- String jsonResponse = Serialization.gson.toJson(dmaapResponse, PciResponseWrapper.class);
-
- /*
- * Use the serializer to convert the json string into a java object
- */
- PciResponseWrapper pciResponseWrapper = Serialization.gson.fromJson(jsonResponse, PciResponseWrapper.class);
- assertNotNull(pciResponseWrapper);
- assertEquals(dmaapResponse, pciResponseWrapper);
-
- /*
- * The type of the DMAAP wrapper should be response
- */
- assertEquals("response", dmaapResponse.getType());
-
- /*
- * The DMAAP wrapper must have a body as that is the true SDNR response
- */
- assertNotNull(dmaapResponse.getBody());
- PciResponse sdnrResponse = dmaapResponse.getBody();
- assertNotNull(sdnrResponse);
-
- /*
- * The common header should not be null
- */
- assertNotNull(sdnrResponse.getCommonHeader());
-
- /*
- * The status should not be null and the status code should be 400
- */
- assertNotNull(sdnrResponse.getStatus());
- assertEquals(400, sdnrResponse.getStatus().getCode());
-
- logger.debug("Response as a Java Object: \n" + sdnrResponse.toString() + "\n\n");
- }
-}
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java
deleted file mode 100644
index e9793b286..000000000
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * sdnr
- * ================================================================================
- * Copyright (C) 2018 Wipro Limited 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.policy.sdnr.util;
-
-import static org.junit.Assert.assertEquals;
-
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-
-import org.junit.Test;
-
-public class SerializationTest {
-
- @Test
- public void test() {
- String nameString = "Dorothy";
- String jsonName = Serialization.gsonPretty.toJson(nameString, String.class);
- assertEquals("\"Dorothy\"", jsonName);
- String jsonInOutName = Serialization.gsonPretty.fromJson(jsonName, String.class);
- assertEquals("Dorothy", jsonInOutName);
-
- Instant instant0 = Instant.ofEpochMilli(1516127215000L);
- String instantString0 = Serialization.gsonPretty.toJson(instant0, Instant.class);
- assertEquals("\"2018-01-16T18:26:55Z\"", instantString0);
- Instant outInstant0 = Serialization.gsonPretty.fromJson(instantString0, Instant.class);
- assertEquals(instant0, outInstant0);
-
- Instant instant1 = Instant.ofEpochMilli(1516127215000L);
- String instantString1 = Serialization.gsonJunit.toJson(instant1, Instant.class);
- assertEquals("1516127215000", instantString1);
- Instant outInstant1 = Serialization.gsonJunit.fromJson(instantString1, Instant.class);
- assertEquals(instant1, outInstant1);
-
- ZonedDateTime zdt = ZonedDateTime.ofInstant(instant0, ZoneId.of("UTC"));
- String zdtString = Serialization.gsonPretty.toJson(zdt, ZonedDateTime.class);
- assertEquals("{\n \"dateTime\": {\n \"date\":", zdtString.substring(0, 29));
- }
-}