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>
author: Jim Hahn <jrh3@att.com> 2019-05-08 14:33:57 -0400
committer: Jim Hahn <jrh3@att.com> 2019-05-08 16:24:35 -0400
commit: 10b21aae2bde224ab7f91f4b5ab1b89369c8fd1c (patch)
tree: 0417099e379e8be69f90221e8fd066fc40def62b /controlloop/common/model-impl/so/src/test
parent: 01841878936986bc80a974977ccdeaceaf7f9a78 (diff)
22 files changed, 0 insertions, 2347 deletions
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
deleted file mode 100644
index 2db347846..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * mso
- * ================================================================================
- * Copyright (C) 2017, 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.policy.so;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.onap.policy.so.SoCloudConfiguration;
-import org.onap.policy.so.SoModelInfo;
-import org.onap.policy.so.SoRelatedInstance;
-import org.onap.policy.so.SoRelatedInstanceListElement;
-import org.onap.policy.so.SoRequest;
-import org.onap.policy.so.SoRequestDetails;
-import org.onap.policy.so.SoRequestInfo;
-import org.onap.policy.so.SoRequestParameters;
-import org.onap.policy.so.util.Serialization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DemoTest {
-    private static final Logger logger = LoggerFactory.getLogger(DemoTest.class);
-
-    @Test
-    public void test() {
-
-        SoRequest request = new SoRequest();
-        request.setRequestDetails(new SoRequestDetails());
-        request.getRequestDetails().setModelInfo(new SoModelInfo());
-        request.getRequestDetails().setCloudConfiguration(new SoCloudConfiguration());
-        request.getRequestDetails().setRequestInfo(new SoRequestInfo());
-        request.getRequestDetails().setRequestParameters(new SoRequestParameters());
-
-        request.getRequestDetails().getModelInfo().setModelType("vfModule");
-        request.getRequestDetails().getModelInfo().setModelInvariantId("ff5256d2-5a33-55df-13ab-12abad84e7ff");
-        request.getRequestDetails().getModelInfo().setModelVersionId("fe6478e5-ea33-3346-ac12-ab121484a3fe");
-        request.getRequestDetails().getModelInfo().setModelName("vSAMP12..base..module-0");
-        request.getRequestDetails().getModelInfo().setModelVersion("1");
-
-        request.getRequestDetails().getCloudConfiguration().setLcpCloudRegionId("mdt1");
-        request.getRequestDetails().getCloudConfiguration().setTenantId("88a6ca3ee0394ade9403f075db23167e");
-
-        request.getRequestDetails().getRequestInfo().setInstanceName("SOTEST103a-vSAMP12_base_module-0");
-        request.getRequestDetails().getRequestInfo().setSource("VID");
-        request.getRequestDetails().getRequestInfo().setSuppressRollback(true);
-
-        SoRelatedInstanceListElement relatedInstanceListElement1 =
-                new SoRelatedInstanceListElement();
-        SoRelatedInstanceListElement relatedInstanceListElement2 =
-                new SoRelatedInstanceListElement();
-        SoRelatedInstanceListElement relatedInstanceListElement3 =
-                new SoRelatedInstanceListElement();
-        relatedInstanceListElement1.setRelatedInstance(new SoRelatedInstance());
-        relatedInstanceListElement2.setRelatedInstance(new SoRelatedInstance());
-        relatedInstanceListElement3.setRelatedInstance(new SoRelatedInstance());
-
-        relatedInstanceListElement1.getRelatedInstance().setInstanceId(
-                "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c");
-        relatedInstanceListElement1.getRelatedInstance().setInstanceName(
-                "SOTESTVOL103a-vSAMP12_base_module-0_vol");
-        relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SoModelInfo());
-        relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelType("volumeGroup");
-
-        relatedInstanceListElement2.getRelatedInstance().setInstanceId("serviceInstanceId");
-        relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SoModelInfo());
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelType("service");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelInvariantId(
-                "ff3514e3-5a33-55df-13ab-12abad84e7ff");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelVersionId(
-                "fe6985cd-ea33-3346-ac12-ab121484a3fe");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelName(
-                "parent service model name");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelVersion("1.0");
-
-        relatedInstanceListElement3.getRelatedInstance().setInstanceId("vnfInstanceId");
-        relatedInstanceListElement3.getRelatedInstance().setModelInfo(new SoModelInfo());
-        relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelType("vnf");
-        relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelInvariantId(
-                "ff5256d1-5a33-55df-13ab-12abad84e7ff");
-        relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelVersionId(
-                "fe6478e4-ea33-3346-ac12-ab121484a3fe");
-        relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelName("vSAMP12");
-        relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelVersion("1.0");
-        relatedInstanceListElement3.getRelatedInstance().getModelInfo().setModelCustomizationName("vSAMP12 1");
-
-        request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement1);
-        request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement2);
-        request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement3);
-
-        Map<String, String> userParam1 = new HashMap<>();
-        userParam1.put("name1", "value1");
-
-        Map<String, String> userParam2 = new HashMap<>();
-        userParam2.put("name2", "value2");
-
-        request.getRequestDetails().getRequestParameters().getUserParams().add(userParam1);
-        request.getRequestDetails().getRequestParameters().getUserParams().add(userParam2);
-
-        logger.debug(Serialization.gsonPretty.toJson(request));
-
-    }
-
-    @Test
-    public void testHack() {
-
-        logger.debug("**  HACK  **");
-
-        SoRequest request = new SoRequest();
-
-        request.setRequestDetails(new SoRequestDetails());
-        request.getRequestDetails().setModelInfo(new SoModelInfo());
-        request.getRequestDetails().setCloudConfiguration(new SoCloudConfiguration());
-        request.getRequestDetails().setRequestInfo(new SoRequestInfo());
-        request.getRequestDetails().setRequestParameters(new SoRequestParameters());
-        request.getRequestDetails().getRequestParameters().setUserParams(null);
-
-        request.getRequestDetails().getModelInfo().setModelType("vfModule");
-        request.getRequestDetails().getModelInfo().setModelInvariantId("a9c4a35a-de48-451a-9e4e-343f2ac52928");
-        request.getRequestDetails().getModelInfo().setModelVersionId("e0d98ad1-238d-4555-b439-023d3f9079f6");
-        request.getRequestDetails().getModelInfo().setModelName("0d9e0d9d352749f4B3cb..dnsscaling..module-0");
-        request.getRequestDetails().getModelInfo().setModelVersion("2.0");
-
-        request.getRequestDetails().getCloudConfiguration().setLcpCloudRegionId("DFW");
-        request.getRequestDetails().getCloudConfiguration().setTenantId("1015548");
-
-        request.getRequestDetails().getRequestInfo().setInstanceName(
-                "Vfmodule_Ete_Name1eScaling63928f-ccdc-4b34-bdef-9bf64109026e");
-        request.getRequestDetails().getRequestInfo().setSource("POLICY");
-        request.getRequestDetails().getRequestInfo().setSuppressRollback(false);
-
-        SoRelatedInstanceListElement relatedInstanceListElement1 =
-                new SoRelatedInstanceListElement();
-        SoRelatedInstanceListElement relatedInstanceListElement2 =
-                new SoRelatedInstanceListElement();
-        relatedInstanceListElement1.setRelatedInstance(new SoRelatedInstance());
-        relatedInstanceListElement2.setRelatedInstance(new SoRelatedInstance());
-
-        String serviceInstanceId = "98af39ce-6408-466b-921f-c2c7a8f59ed6";
-        relatedInstanceListElement1.getRelatedInstance().setInstanceId(serviceInstanceId);
-        relatedInstanceListElement1.getRelatedInstance().setModelInfo(new SoModelInfo());
-        relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelType("service");
-        relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelInvariantId(
-                "24329a0c-1d57-4210-b1af-a65df64e9d59");
-        relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelVersionId(
-                "ac642881-8e7e-4217-bd64-16ad41c42e30");
-        relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelName("5116d67e-0b4f-46bf-a46f");
-        relatedInstanceListElement1.getRelatedInstance().getModelInfo().setModelVersion("2.0");
-
-        String vnfInstanceId = "8eb411b8-a936-412f-b01f-9a9a435c0e93";
-        relatedInstanceListElement2.getRelatedInstance().setInstanceId(vnfInstanceId);
-        relatedInstanceListElement2.getRelatedInstance().setModelInfo(new SoModelInfo());
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelType("vnf");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelInvariantId(
-                "09fd971e-db5f-475d-997c-cf6704b6b8fe");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelVersionId(
-                "152ed917-6dcc-46ee-bf8a-a775c5aa5a74");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelName("9e4c31d2-4b25-4d9e-9fb4");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelVersion("2.0");
-        relatedInstanceListElement2.getRelatedInstance().getModelInfo().setModelCustomizationName(
-                "0d9e0d9d-3527-49f4-b3cb 2");
-
-        request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement1);
-        request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement2);
-
-        logger.debug(Serialization.gsonPretty.toJson(request));
-    }
-
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DummyWorkingMemory.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DummyWorkingMemory.java
deleted file mode 100644
index b8fd036c5..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DummyWorkingMemory.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * Copyright (C) 2018 Ericsson. 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.so;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.drools.core.WorkingMemory;
-import org.drools.core.WorkingMemoryEntryPoint;
-import org.drools.core.common.InternalFactHandle;
-import org.drools.core.impl.InternalKnowledgeBase;
-import org.drools.core.spi.AsyncExceptionHandler;
-import org.drools.core.spi.GlobalResolver;
-import org.kie.api.event.kiebase.KieBaseEventListener;
-import org.kie.api.event.rule.AgendaEventListener;
-import org.kie.api.event.rule.RuleRuntimeEventListener;
-import org.kie.api.runtime.Environment;
-import org.kie.api.runtime.ObjectFilter;
-import org.kie.api.runtime.process.ProcessInstance;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.kie.api.runtime.rule.Agenda;
-import org.kie.api.runtime.rule.AgendaFilter;
-import org.kie.api.runtime.rule.FactHandle;
-import org.kie.api.runtime.rule.FactHandle.State;
-import org.kie.api.runtime.rule.QueryResults;
-import org.kie.api.time.SessionClock;
-
-public class DummyWorkingMemory implements WorkingMemory {
-
-    @Override
-    public void addEventListener(RuleRuntimeEventListener listener) {
-    }
-
-    @Override
-    public void addEventListener(AgendaEventListener listener) {
-    }
-
-    @Override
-    public void addEventListener(KieBaseEventListener listener) {
-    }
-
-    @Override
-    public void removeEventListener(RuleRuntimeEventListener listener) {
-    }
-
-    @Override
-    public void removeEventListener(AgendaEventListener listener) {
-    }
-
-    @Override
-    public void removeEventListener(KieBaseEventListener listener) {
-    }
-
-    @Override
-    public Collection<RuleRuntimeEventListener> getRuleRuntimeEventListeners() {
-        return null;
-    }
-
-    @Override
-    public Collection<AgendaEventListener> getAgendaEventListeners() {
-        return null;
-    }
-
-    @Override
-    public Collection<KieBaseEventListener> getKieBaseEventListeners() {
-        return null;
-    }
-
-    @Override
-    public FactHandle insert(Object object, boolean dynamic) {
-        return null;
-    }
-
-    @Override
-    public FactHandle insert(Object object) {
-        return null;
-    }
-
-    @Override
-    public void dispose() {
-    }
-
-    @Override
-    public String getEntryPointId() {
-        return null;
-    }
-
-    @Override
-    public void retract(FactHandle handle) {
-    }
-
-    @Override
-    public void delete(FactHandle handle) {
-    }
-
-    @Override
-    public void delete(FactHandle handle, State fhState) {
-
-
-    }
-
-    @Override
-    public void update(FactHandle handle, Object object) {
-    }
-
-    @Override
-    public void update(FactHandle handle, Object object, String... modifiedProperties) {
-    }
-
-    @Override
-    public Collection<? extends Object> getObjects() {
-        return null;
-    }
-
-    @Override
-    public Collection<? extends Object> getObjects(ObjectFilter filter) {
-        return null;
-    }
-
-    @Override
-    public <T extends FactHandle> Collection<T> getFactHandles() {
-        return null;
-    }
-
-    @Override
-    public <T extends FactHandle> Collection<T> getFactHandles(ObjectFilter filter) {
-        return null;
-    }
-
-    @Override
-    public long getFactCount() {
-        return 0;
-    }
-
-    @Override
-    public Agenda getAgenda() {
-        return null;
-    }
-
-    @Override
-    public void setGlobal(String identifier, Object value) {
-    }
-
-    @Override
-    public Object getGlobal(String identifier) {
-        return null;
-    }
-
-    @Override
-    public Environment getEnvironment() {
-        return null;
-    }
-
-    @Override
-    public void setGlobalResolver(GlobalResolver globalResolver) {
-    }
-
-    @Override
-    public GlobalResolver getGlobalResolver() {
-        return null;
-    }
-
-    @Override
-    public InternalKnowledgeBase getKnowledgeBase() {
-        return null;
-    }
-
-    @Override
-    public int fireAllRules() {
-        return 0;
-    }
-
-    @Override
-    public int fireAllRules(AgendaFilter agendaFilter) {
-        return 0;
-    }
-
-    @Override
-    public int fireAllRules(int fireLimit) {
-        return 0;
-    }
-
-    @Override
-    public int fireAllRules(AgendaFilter agendaFilter, int fireLimit) {
-        return 0;
-    }
-
-    @Override
-    public Object getObject(FactHandle handle) {
-        return null;
-    }
-
-    @Override
-    public FactHandle getFactHandle(Object object) {
-        return null;
-    }
-
-    @Override
-    public FactHandle getFactHandleByIdentity(Object object) {
-        return null;
-    }
-
-    @Override
-    public Iterator<?> iterateObjects() {
-        return null;
-    }
-
-    @Override
-    public Iterator<?> iterateObjects(ObjectFilter filter) {
-        return null;
-    }
-
-    @Override
-    public Iterator<InternalFactHandle> iterateFactHandles() {
-        return null;
-    }
-
-    @Override
-    public Iterator<InternalFactHandle> iterateFactHandles(ObjectFilter filter) {
-        return null;
-    }
-
-    @Override
-    public void setFocus(String focus) {
-    }
-
-    @Override
-    public QueryResults getQueryResults(String query, Object... arguments) {
-        return null;
-    }
-
-    @Override
-    public void setAsyncExceptionHandler(AsyncExceptionHandler handler) {
-    }
-
-    @Override
-    public void clearAgenda() {
-    }
-
-    @Override
-    public void clearAgendaGroup(String group) {
-    }
-
-    @Override
-    public void clearActivationGroup(String group) {
-    }
-
-    @Override
-    public void clearRuleFlowGroup(String group) {
-    }
-
-    @Override
-    public ProcessInstance startProcess(String processId) {
-        return null;
-    }
-
-    @Override
-    public ProcessInstance startProcess(String processId, Map<String, Object> parameters) {
-        return null;
-    }
-
-    @Override
-    public Collection<ProcessInstance> getProcessInstances() {
-        return null;
-    }
-
-    @Override
-    public ProcessInstance getProcessInstance(long id) {
-        return null;
-    }
-
-    @Override
-    public ProcessInstance getProcessInstance(long id, boolean readOnly) {
-        return null;
-    }
-
-    @Override
-    public WorkItemManager getWorkItemManager() {
-        return null;
-    }
-
-    @Override
-    public void halt() {
-    }
-
-    @Override
-    public WorkingMemoryEntryPoint getWorkingMemoryEntryPoint(String id) {
-        return null;
-    }
-
-    @Override
-    public SessionClock getSessionClock() {
-        return null;
-    }
-
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
deleted file mode 100755
index 64467b299..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.time.LocalDateTime;
-
-import org.junit.Test;
-
-public class SoAsyncRequestStatusTest {
-
-    @Test
-    public void testConstructor() {
-        SoAsyncRequestStatus obj = new SoAsyncRequestStatus();
-
-        assertTrue(obj.getCorrelator() == null);
-        assertTrue(obj.getFinishTime() == null);
-        assertTrue(obj.getInstanceReferences() == null);
-        assertTrue(obj.getRequestId() == null);
-        assertTrue(obj.getRequestScope() == null);
-        assertTrue(obj.getRequestStatus() == null);
-        assertTrue(obj.getStartTime() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoAsyncRequestStatus obj = new SoAsyncRequestStatus();
-
-        obj.setCorrelator("correlator");
-        assertEquals("correlator", obj.getCorrelator());
-
-        LocalDateTime finishTime = LocalDateTime.now();
-        obj.setFinishTime(finishTime);
-        assertEquals(finishTime, obj.getFinishTime());
-
-        SoInstanceReferences instanceReferences = new SoInstanceReferences();
-        obj.setInstanceReferences(instanceReferences);
-        assertEquals(instanceReferences, obj.getInstanceReferences());
-
-        obj.setRequestId("requestId");
-        assertEquals("requestId", obj.getRequestId());
-
-        obj.setRequestScope("requestScope");
-        assertEquals("requestScope", obj.getRequestScope());
-
-        SoRequestStatus requestStatus = new SoRequestStatus();
-        obj.setRequestStatus(requestStatus);
-        assertEquals(requestStatus, obj.getRequestStatus());
-
-        obj.setRequestType("requestType");
-        assertEquals("requestType", obj.getRequestType());
-
-        LocalDateTime startTime = LocalDateTime.now();
-        obj.setStartTime(startTime);
-        assertEquals(startTime, obj.getStartTime());
-
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java
deleted file mode 100755
index 0b6521be1..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoCloudConfigurationTest {
-
-    @Test
-    public void testConstructor() {
-        SoCloudConfiguration obj = new SoCloudConfiguration();
-
-        assertTrue(obj.getLcpCloudRegionId() == null);
-        assertTrue(obj.getTenantId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoCloudConfiguration obj = new SoCloudConfiguration();
-
-        obj.setLcpCloudRegionId("lcpCloudRegionId");
-        assertEquals("lcpCloudRegionId", obj.getLcpCloudRegionId());
-
-        obj.setTenantId("tenantId");
-        assertEquals("tenantId", obj.getTenantId());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServerTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServerTest.java
deleted file mode 100644
index 5c302474a..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServerTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018-2019 AT&T. 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.so;
-
-import com.google.gson.Gson;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-
-@Path("/SO")
-public class SoDummyServerTest {
-
-    private static int postMessagesReceived = 0;
-    private static int putMessagesReceived = 0;
-    private static int statMessagesReceived = 0;
-    private static int getMessagesReceived = 0;
-    private static int deleteMessagesReceived = 0;
-
-    private static Map<String, SoResponse> ongoingRequestMap = new ConcurrentHashMap<>();
-
-    /**
-     * Stats method.
-     * 
-     * @return response
-     */
-    @GET
-    @Path("/Stats")
-    public Response serviceGetStats() {
-        statMessagesReceived++;
-        return Response.status(200).entity("{\"GET\": " + getMessagesReceived + ",\"STAT\": " + statMessagesReceived
-                + ",\"POST\": " + postMessagesReceived + ",\"PUT\": " + putMessagesReceived
-                + ",\"DELETE\": " + deleteMessagesReceived + "}").build();
-
-    }
-
-    /**
-     * Get stat type.
-     * 
-     * @param statType the stat type
-     * @return http response
-     */
-    @GET
-    @Path("/OneStat/{statType}")
-    public Response serviceGetStat(@PathParam("statType") final String statType) {
-        statMessagesReceived++;
-        return Response.status(200).entity("{\"TYPE\": " + statType + "}").build();
-    }
-
-    /**
-     * Post to service instantiation.
-     * 
-     * @param jsonString string to send
-     * @return http response
-     */
-    @POST
-    @Path("/serviceInstantiation/v7")
-    public Response servicePostRequest(final String jsonString) {
-        postMessagesReceived++;
-        return buildResponse(jsonString);
-    }
-
-    /**
-     * Post.
-     * 
-     * @param serviceInstanceId service instance id
-     * @param vnfInstanceId vnf instance id
-     * @param jsonString json body
-     * @return http response
-     */
-    @POST
-    @Path("/serviceInstantiation/v7/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut")
-    public Response servicePostRequestVfModules(@PathParam("serviceInstanceId") final String serviceInstanceId,
-                    @PathParam("vnfInstanceId") final String vnfInstanceId, final String jsonString) {
-        postMessagesReceived++;
-        return buildResponse(jsonString);
-    }
-
-    /**
-     * Get instance ID.
-     * 
-     * @param nsInstanceId node instance id
-     * @return http response
-     */
-    @GET
-    @Path("/orchestrationRequests/v5/{nsInstanceId}")
-    public Response soRequestStatus(@PathParam("nsInstanceId") final String nsInstanceId) {
-
-        SoResponse response = ongoingRequestMap.get(nsInstanceId);
-
-        int iterationsLeft = Integer.valueOf(response.getRequest().getRequestScope());
-        if (--iterationsLeft > 0) {
-            response.getRequest().setRequestScope(new Integer(iterationsLeft).toString());
-            String responseString = new Gson().toJson(response, SoResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
-        }
-
-        ongoingRequestMap.remove(nsInstanceId);
-
-        if ("ReturnBadAfterWait".equals(response.getRequest().getRequestType())) {
-            return Response.status(400).build();
-        }
-
-        response.getRequest().getRequestStatus().setRequestState("COMPLETE");
-        response.getRequest().setRequestScope("0");
-        response.setHttpResponseCode(200);
-        String responseString = new Gson().toJson(response, SoResponse.class);
-        return Response.status(response.getHttpResponseCode()).entity(responseString).build();
-    }
-
-    /**
-     * Delete.
-     *
-     * @param serviceInstanceId service instance id
-     * @param vnfInstanceId vnf instance id
-     * @param vfModuleInstanceId vf module instance id
-     * @param jsonString json body
-     * @return http response
-     */
-    @DELETE
-    @Path("/serviceInstances/v7/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}")
-    public Response serviceDeleteRequestVfModules(
-            @PathParam("serviceInstanceId") final String serviceInstanceId,
-            @PathParam("vnfInstanceId") final String vnfInstanceId,
-            @PathParam("vfModuleInstanceId") final String vfModuleInstanceId,
-            final String jsonString) {
-        deleteMessagesReceived++;
-        return buildResponse(jsonString);
-    }
-
-    private Response buildResponse(String jsonString) {
-        if (jsonString == null) {
-            return Response.status(400).build();
-        }
-
-        SoRequest request = null;
-        try {
-            request = new Gson().fromJson(jsonString, SoRequest.class);
-        } catch (Exception e) {
-            return Response.status(400).build();
-        }
-
-        if (request == null) {
-            return Response.status(400).build();
-        }
-
-        if (request.getRequestType() == null) {
-            return Response.status(400).build();
-        }
-
-        if ("ReturnBadJson".equals(request.getRequestType())) {
-            return Response.status(200)
-                    .entity("{\"GET\": , " + getMessagesReceived + ",\"STAT\": " + statMessagesReceived
-                            + ",\"POST\":" + " , " + postMessagesReceived + ",\"PUT\": " + putMessagesReceived
-                            + ",\"DELETE\": " + deleteMessagesReceived + "}").build();
-        }
-
-        SoResponse response = new SoResponse();
-        response.setRequest(request);
-        response.setRequestReferences(new SoRequestReferences());
-        response.getRequestReferences().setRequestId(request.getRequestId().toString());
-
-        if ("ReturnCompleted".equals(request.getRequestType())) {
-            response.getRequest().getRequestStatus().setRequestState("COMPLETE");
-            response.setHttpResponseCode(200);
-            String responseString = new Gson().toJson(response, SoResponse.class);
-            return Response.status(response.getHttpResponseCode())
-                    .entity(responseString)
-                    .build();
-        }
-
-        if ("ReturnFailed".equals(request.getRequestType())) {
-            response.getRequest().getRequestStatus().setRequestState("FAILED");
-            response.setHttpResponseCode(200);
-            String responseString = new Gson().toJson(response, SoResponse.class);
-            return Response.status(response.getHttpResponseCode())
-                    .entity(responseString)
-                    .build();
-        }
-
-        if ("ReturnOnging202".equals(request.getRequestType())) {
-            ongoingRequestMap.put(request.getRequestId().toString(), response);
-
-            response.getRequest().getRequestStatus().setRequestState("ONGOING");
-            response.setHttpResponseCode(202);
-            String responseString = new Gson().toJson(response, SoResponse.class);
-            return Response.status(response.getHttpResponseCode())
-                    .entity(responseString)
-                    .build();
-        }
-
-        if ("ReturnOnging200".equals(request.getRequestType())) {
-            ongoingRequestMap.put(request.getRequestId().toString(), response);
-
-            response.getRequest().getRequestStatus().setRequestState("ONGOING");
-            response.setHttpResponseCode(200);
-            String responseString = new Gson().toJson(response, SoResponse.class);
-            return Response.status(response.getHttpResponseCode())
-                    .entity(responseString)
-                    .build();
-        }
-
-        if ("ReturnBadAfterWait".equals(request.getRequestType())) {
-            ongoingRequestMap.put(request.getRequestId().toString(), response);
-
-            response.getRequest().getRequestStatus().setRequestState("ONGOING");
-            response.setHttpResponseCode(200);
-            String responseString = new Gson().toJson(response, SoResponse.class);
-            return Response.status(response.getHttpResponseCode())
-                    .entity(responseString)
-                    .build();
-        }
-        return null;
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java
deleted file mode 100755
index 13d7dd83b..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoInstanceReferencesTest {
-
-    @Test
-    public void testConstructor() {
-        SoInstanceReferences obj = new SoInstanceReferences();
-
-        assertTrue(obj.getInstanceId() == null);
-        assertTrue(obj.getRequestId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoInstanceReferences obj = new SoInstanceReferences();
-
-        obj.setInstanceId("instanceId");
-        assertEquals("instanceId", obj.getInstanceId());
-
-        obj.setRequestId("requestId");
-        assertEquals("requestId", obj.getRequestId());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java
deleted file mode 100644
index e2482569d..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * TestSOManager
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018-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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.UUID;
-import java.util.concurrent.Future;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.drools.core.WorkingMemory;
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.drools.system.PolicyEngine;
-
-public class SoManagerTest {
-    private static final String BASE_URI = "http://localhost:46553/TestSOManager";
-    private static final String BASE_SO_URI = BASE_URI + "/SO";
-    private static HttpServer server;
-
-    /**
-     * Set up test class.
-     */
-    @BeforeClass
-    public static void setUp() throws IOException {
-        final ResourceConfig rc = new ResourceConfig(SoDummyServerTest.class);
-        //Grizzly by default doesn't allow payload for HTTP methods (ex: DELETE), for which HTTP spec doesn't
-        // explicitly state that.
-        //allow it before starting the server
-        server = GrizzlyHttpServerFactory.createHttpServer(URI.create(BASE_URI), rc, false);
-        server.getServerConfiguration().setAllowPayloadForUndefinedHttpMethods(true);
-        server.start();
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        server.shutdown();
-    }
-
-    @Test
-    public void testGrizzlyServer() throws ClientProtocolException, IOException {
-        CloseableHttpClient httpclient = HttpClients.createDefault();
-        HttpGet httpGet = new HttpGet("http://localhost:46553/TestSOManager/SO/Stats");
-        CloseableHttpResponse response = httpclient.execute(httpGet);
-
-        String returnBody = EntityUtils.toString(response.getEntity(), "UTF-8");
-        assertTrue(returnBody.matches("^\\{\"GET\": [0-9]*,\"STAT\": [0-9]*,\"POST\": [0-9]*,\"PUT\": [0-9]*,"
-                + "\"DELETE\": [0-9]*\\}$"));
-    }
-
-    @Test
-    public void testServiceInstantiation() throws IOException {
-        SoManager manager = new SoManager();
-        assertNotNull(manager);
-        manager.setRestGetTimeout(100);
-
-        SoResponse response = manager.createModuleInstance("http:/localhost:99999999", BASE_SO_URI, "sean",
-                "citizen", null);
-        assertNull(response);
-
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", null);
-        assertNull(response);
-
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", new SoRequest());
-        assertNull(response);
-
-        SoRequest request = new SoRequest();
-        request.setRequestId(UUID.randomUUID());
-        request.setRequestScope("Test");
-        request.setRequestType("ReturnBadJson");
-        request.setStartTime("2018-03-23 16:31");
-        request.setRequestStatus(new SoRequestStatus());
-        request.getRequestStatus().setRequestState("ONGOING");
-
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", request);
-        assertNull(response);
-
-        request.setRequestType("ReturnCompleted");
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", request);
-        assertNotNull(response);
-        assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-
-        request.setRequestType("ReturnFailed");
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", request);
-        assertNotNull(response);
-        assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
-
-        // Use scope to set the number of iterations we'll wait for
-
-        request.setRequestType("ReturnOnging200");
-        request.setRequestScope(new Integer(10).toString());
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", request);
-        assertNotNull(response);
-        assertNotNull(response.getRequest());
-        assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-
-        request.setRequestType("ReturnOnging202");
-        request.setRequestScope(new Integer(20).toString());
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", request);
-        assertNotNull(response);
-        assertNotNull(response.getRequest());
-        assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-
-        // Test timeout after 20 attempts for a response
-        request.setRequestType("ReturnOnging202");
-        request.setRequestScope(new Integer(21).toString());
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", request);
-        assertNull(response);
-
-        // Test bad response after 3 attempts for a response
-        request.setRequestType("ReturnBadAfterWait");
-        request.setRequestScope(new Integer(3).toString());
-        response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
-                        "citizen", request);
-        assertNull(response);
-    }
-
-    @Test
-    public void testVfModuleCreation() throws IOException {
-        SoManager manager = new SoManager();
-        assertNotNull(manager);
-        manager.setRestGetTimeout(100);
-
-        PolicyEngine.manager.setEnvironmentProperty("so.username", "sean");
-        PolicyEngine.manager.setEnvironmentProperty("so.password", "citizen");
-
-        WorkingMemory wm = new DummyWorkingMemory();
-
-        SoRequest soRequest = new SoRequest();
-        soRequest.setOperationType(SoOperationType.SCALE_OUT);
-        PolicyEngine.manager.setEnvironmentProperty("so.url", "http:/localhost:99999999");
-        Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm,
-                        UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        PolicyEngine.manager.setEnvironmentProperty("so.url", BASE_SO_URI);
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), soRequest);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        SoRequest request = new SoRequest();
-        request.setRequestId(UUID.randomUUID());
-        request.setRequestScope("Test");
-        request.setRequestType("ReturnBadJson");
-        request.setStartTime("2018-03-23 16:31");
-        request.setRequestStatus(new SoRequestStatus());
-        request.getRequestStatus().setRequestState("ONGOING");
-        request.setOperationType(SoOperationType.SCALE_OUT);
-
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        request.setRequestType("ReturnCompleted");
-
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        request.setRequestType("ReturnFailed");
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        // Use scope to set the number of iterations we'll wait for
-
-        request.setRequestType("ReturnOnging200");
-        request.setRequestScope(new Integer(10).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertNotNull(response.getRequest());
-            assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        request.setRequestType("ReturnOnging202");
-        request.setRequestScope(new Integer(20).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertNotNull(response.getRequest());
-            assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        // Test timeout after 20 attempts for a response
-        request.setRequestType("ReturnOnging202");
-        request.setRequestScope(new Integer(21).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        // Test bad response after 3 attempts for a response
-        request.setRequestType("ReturnBadAfterWait");
-        request.setRequestScope(new Integer(3).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                        UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-    }
-
-    @Test
-    public void testVfModuleDeletion() {
-        SoManager manager = new SoManager();
-        assertNotNull(manager);
-        manager.setRestGetTimeout(100);
-
-        PolicyEngine.manager.setEnvironmentProperty("so.username", "sean");
-        PolicyEngine.manager.setEnvironmentProperty("so.password", "citizen");
-
-        WorkingMemory wm = new DummyWorkingMemory();
-
-        SoRequest soRequest = new SoRequest();
-        soRequest.setOperationType(SoOperationType.DELETE_VF_MODULE);
-        PolicyEngine.manager.setEnvironmentProperty("so.url", "http:/localhost:99999999");
-        Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm,
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        PolicyEngine.manager.setEnvironmentProperty("so.url", BASE_SO_URI);
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        SoRequest request = new SoRequest();
-        request.setRequestId(UUID.randomUUID());
-        request.setRequestScope("Test");
-        request.setRequestType("ReturnBadJson");
-        request.setStartTime("2018-03-23 16:31");
-        request.setRequestStatus(new SoRequestStatus());
-        request.getRequestStatus().setRequestState("ONGOING");
-        request.setOperationType(SoOperationType.DELETE_VF_MODULE);
-
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        request.setRequestType("ReturnCompleted");
-
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        request.setRequestType("ReturnFailed");
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        // Use scope to set the number of iterations we'll wait for
-
-        request.setRequestType("ReturnOnging200");
-        request.setRequestScope(new Integer(10).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertNotNull(response.getRequest());
-            assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        request.setRequestType("ReturnOnging202");
-        request.setRequestScope(new Integer(20).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertNotNull(response.getRequest());
-            assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        // Test timeout after 20 attempts for a response
-        request.setRequestType("ReturnOnging202");
-        request.setRequestScope(new Integer(21).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-
-        // Test bad response after 3 attempts for a response
-        request.setRequestType("ReturnBadAfterWait");
-        request.setRequestScope(new Integer(3).toString());
-        asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), wm, UUID.randomUUID().toString(),
-                UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
-        try {
-            SoResponse response = asyncRestCallFuture.get();
-            assertEquals(999, response.getHttpResponseCode());
-        } catch (Exception e) {
-            fail("test should not throw an exception");
-        }
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java
deleted file mode 100755
index 3cc415cdd..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoModelInfoTest {
-
-    @Test
-    public void testConstructor() {
-        SoModelInfo obj = new SoModelInfo();
-
-        assertTrue(obj.getModelCustomizationId() == null);
-        assertTrue(obj.getModelCustomizationName() == null);
-        assertTrue(obj.getModelInvariantId() == null);
-        assertTrue(obj.getModelName() == null);
-        assertTrue(obj.getModelType() == null);
-        assertTrue(obj.getModelVersion() == null);
-        assertTrue(obj.getModelVersionId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoModelInfo obj = new SoModelInfo();
-
-        obj.setModelCustomizationId("modelCustomizationId");
-        assertEquals("modelCustomizationId", obj.getModelCustomizationId());
-
-        obj.setModelCustomizationName("modelCustomizationName");
-        assertEquals("modelCustomizationName", obj.getModelCustomizationName());
-
-        obj.setModelInvariantId("modelInvariantId");
-        assertEquals("modelInvariantId", obj.getModelInvariantId());
-
-        obj.setModelName("modelName");
-        assertEquals("modelName", obj.getModelName());
-
-        obj.setModelType("modelType");
-        assertEquals("modelType", obj.getModelType());
-
-        obj.setModelVersion("modelVersion");
-        assertEquals("modelVersion", obj.getModelVersion());
-
-        obj.setModelVersionId("modelVersionId");
-        assertEquals("modelVersionId", obj.getModelVersionId());
-
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java
deleted file mode 100755
index 00dfb8dc6..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * Copyright (C) 2017, 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoPolicyExceptionHolderTest {
-
-    @Test
-    public void testConstructor() {
-        SoPolicyExceptionHolder obj = new SoPolicyExceptionHolder();
-
-        assertTrue(obj.getMessageId() == null);
-        assertTrue(obj.getText() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoPolicyExceptionHolder obj = new SoPolicyExceptionHolder();
-
-        obj.setMessageId("messageId");
-        assertEquals("messageId", obj.getMessageId());
-
-        obj.setText("text");
-        assertEquals("text", obj.getText());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java
deleted file mode 100755
index c73a0ea05..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoRelatedInstanceListElementTest {
-
-    @Test
-    public void testConstructor() {
-        SoRelatedInstanceListElement obj = new SoRelatedInstanceListElement();
-
-        assertTrue(obj.getRelatedInstance() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRelatedInstanceListElement obj = new SoRelatedInstanceListElement();
-
-        SoRelatedInstance relatedInstance = new SoRelatedInstance();
-        obj.setRelatedInstance(relatedInstance);
-        assertEquals(relatedInstance, obj.getRelatedInstance());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java
deleted file mode 100755
index 70f585efe..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * Copyright (C) 2017, 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoRelatedInstanceTest {
-
-    @Test
-    public void testConstructor() {
-        SoRelatedInstance obj = new SoRelatedInstance();
-
-        assertTrue(obj.getInstanceId() == null);
-        assertTrue(obj.getInstanceName() == null);
-        assertTrue(obj.getModelInfo() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRelatedInstance obj = new SoRelatedInstance();
-
-        obj.setInstanceId("instanceId");
-        assertEquals("instanceId", obj.getInstanceId());
-
-        obj.setInstanceName("instanceName");
-        assertEquals("instanceName", obj.getInstanceName());
-
-        SoModelInfo modelInfo = new SoModelInfo();
-        obj.setModelInfo(modelInfo);
-        assertEquals(modelInfo, obj.getModelInfo());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
deleted file mode 100755
index 7233482f6..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * Modifications 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.policy.so;
-
-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.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-public class SoRequestDetailsTest {
-
-    @Test
-    public void testConstructor() {
-        SoRequestDetails obj = new SoRequestDetails();
-
-        assertTrue(obj.getCloudConfiguration() == null);
-        assertTrue(obj.getModelInfo() == null);
-        assertTrue(obj.getRequestInfo() == null);
-        assertTrue(obj.getRequestParameters() == null);
-        assertTrue(obj.getSubscriberInfo() == null);
-
-        assertTrue(obj.getRelatedInstanceList() != null);
-        assertEquals(0, obj.getRelatedInstanceList().size());
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRequestDetails obj = new SoRequestDetails();
-
-        SoCloudConfiguration cloudConfiguration = new SoCloudConfiguration();
-        obj.setCloudConfiguration(cloudConfiguration);
-        assertEquals(cloudConfiguration, obj.getCloudConfiguration());
-
-        SoModelInfo modelInfo = new SoModelInfo();
-        obj.setModelInfo(modelInfo);
-        assertEquals(modelInfo, obj.getModelInfo());
-
-        SoRequestInfo requestInfo = new SoRequestInfo();
-        obj.setRequestInfo(requestInfo);
-        assertEquals(requestInfo, obj.getRequestInfo());
-
-        SoRequestParameters requestParameters = new SoRequestParameters();
-        obj.setRequestParameters(requestParameters);
-        assertEquals(requestParameters, obj.getRequestParameters());
-
-        SoSubscriberInfo subscriberInfo = new SoSubscriberInfo();
-        obj.setSubscriberInfo(subscriberInfo);
-        assertEquals(subscriberInfo, obj.getSubscriberInfo());
-    }
-    
-    @Test
-    public void testSoMRequestDetailsMethods() {
-        SoRequestDetails details = new SoRequestDetails();
-        assertNotNull(details);
-        assertNotEquals(0, details.hashCode());
-
-        SoCloudConfiguration cloudConfiguration = new SoCloudConfiguration();
-        details.setCloudConfiguration(cloudConfiguration);
-        assertEquals(cloudConfiguration, details.getCloudConfiguration());
-        assertNotEquals(0, details.hashCode());
-
-        SoModelInfo modelInfo = new SoModelInfo();
-        details.setModelInfo(modelInfo);
-        assertEquals(modelInfo, details.getModelInfo());
-        assertNotEquals(0, details.hashCode());
-
-        List<SoRelatedInstanceListElement> relatedInstanceList = new ArrayList<>();
-        details.setRelatedInstanceList(relatedInstanceList);
-        assertEquals(relatedInstanceList, details.getRelatedInstanceList());
-        assertNotEquals(0, details.hashCode());
-
-        SoRequestInfo requestInfo = new SoRequestInfo();
-        details.setRequestInfo(requestInfo);
-        assertEquals(requestInfo, details.getRequestInfo());
-        assertNotEquals(0, details.hashCode());
-
-        SoRequestParameters requestParameters = new SoRequestParameters();
-        details.setRequestParameters(requestParameters);
-        assertEquals(requestParameters, details.getRequestParameters());
-        assertNotEquals(0, details.hashCode());
-
-        SoSubscriberInfo subscriberInfo = new SoSubscriberInfo();
-        details.setSubscriberInfo(subscriberInfo);
-        assertEquals(subscriberInfo, details.getSubscriberInfo());
-        assertNotEquals(0, details.hashCode());
-
-        assertEquals("SORequestDetails [modelInfo=org.onap.policy.so", details.toString().substring(0,  46));
-
-        SoRequestDetails copiedDetails = new SoRequestDetails(details);
-
-        assertTrue(details.equals(details));
-        assertTrue(details.equals(copiedDetails));
-        assertFalse(details.equals(null));
-        assertFalse(details.equals("Hello"));
-        
-        details.setCloudConfiguration(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setCloudConfiguration(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setCloudConfiguration(cloudConfiguration);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setCloudConfiguration(cloudConfiguration);
-        assertTrue(details.equals(copiedDetails));
-
-        details.setModelInfo(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setModelInfo(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setModelInfo(modelInfo);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setModelInfo(modelInfo);
-        assertTrue(details.equals(copiedDetails));
-        
-        details.setRequestInfo(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestInfo(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setRequestInfo(requestInfo);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestInfo(requestInfo);
-        assertTrue(details.equals(copiedDetails));
-
-        details.setRequestParameters(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestParameters(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setRequestParameters(requestParameters);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestParameters(requestParameters);
-        assertTrue(details.equals(copiedDetails));
-
-        details.setSubscriberInfo(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setSubscriberInfo(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setSubscriberInfo(subscriberInfo);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setSubscriberInfo(subscriberInfo);
-        assertTrue(details.equals(copiedDetails));
-
-        details.setRelatedInstanceList(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRelatedInstanceList(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setRelatedInstanceList(relatedInstanceList);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRelatedInstanceList(relatedInstanceList);
-        assertTrue(details.equals(copiedDetails));
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java
deleted file mode 100755
index b870dbd99..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoRequestErrorTest {
-
-    @Test
-    public void testConstructor() {
-        SoRequestError obj = new SoRequestError();
-
-        assertTrue(obj.getPolicyException() == null);
-        assertTrue(obj.getServiceException() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRequestError obj = new SoRequestError();
-
-        SoPolicyExceptionHolder policyException = new SoPolicyExceptionHolder();
-        obj.setPolicyException(policyException);
-        assertEquals(policyException, obj.getPolicyException());
-
-        SoServiceExceptionHolder serviceException = new SoServiceExceptionHolder();
-        obj.setServiceException(serviceException);
-        assertEquals(serviceException, obj.getServiceException());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java
deleted file mode 100755
index 0e518018b..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoRequestInfoTest {
-
-    @Test
-    public void testConstructor() {
-        SoRequestInfo obj = new SoRequestInfo();
-
-        assertTrue(obj.getBillingAccountNumber() == null);
-        assertTrue(obj.getCallbackUrl() == null);
-        assertTrue(obj.getCorrelator() == null);
-        assertTrue(obj.getInstanceName() == null);
-        assertTrue(obj.getOrderNumber() == null);
-        assertTrue(obj.getOrderVersion() == null);
-        assertTrue(obj.getProductFamilyId() == null);
-        assertTrue(obj.getRequestorId() == null);
-        assertTrue(obj.getSource() == null);
-        assertTrue(obj.isSuppressRollback() == false);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRequestInfo obj = new SoRequestInfo();
-
-        obj.setBillingAccountNumber("billingAccountNumber");
-        assertEquals("billingAccountNumber", obj.getBillingAccountNumber());
-
-        obj.setCallbackUrl("callbackUrl");
-        assertEquals("callbackUrl", obj.getCallbackUrl());
-
-        obj.setCorrelator("correlator");
-        assertEquals("correlator", obj.getCorrelator());
-
-        obj.setInstanceName("instanceName");
-        assertEquals("instanceName", obj.getInstanceName());
-
-        obj.setOrderNumber("orderNumber");
-        assertEquals("orderNumber", obj.getOrderNumber());
-
-        int orderVersion = 2008;
-        obj.setOrderVersion(orderVersion);
-        assertEquals((Integer) orderVersion, obj.getOrderVersion());
-
-        obj.setProductFamilyId("productFamilyId");
-        assertEquals("productFamilyId", obj.getProductFamilyId());
-
-        obj.setRequestorId("requestorId");
-        assertEquals("requestorId", obj.getRequestorId());
-
-        obj.setSource("source");
-        assertEquals("source", obj.getSource());
-
-        obj.setSuppressRollback(true);
-        assertEquals(true, obj.isSuppressRollback());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java
deleted file mode 100755
index 7d671f5e1..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoRequestParametersTest {
-
-    @Test
-    public void testConstructor() {
-        SoRequestParameters obj = new SoRequestParameters();
-
-        assertTrue(obj.getSubscriptionServiceType() == null);
-        assertTrue(obj.getUserParams() != null);
-        assertEquals(0, obj.getUserParams().size());
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRequestParameters obj = new SoRequestParameters();
-
-        obj.setSubscriptionServiceType("subscriptionServiceType");
-        assertEquals("subscriptionServiceType", obj.getSubscriptionServiceType());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java
deleted file mode 100755
index 549147e4b..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoRequestReferencesTest {
-
-    @Test
-    public void testConstructor() {
-        SoRequestReferences obj = new SoRequestReferences();
-
-        assertTrue(obj.getInstanceId() == null);
-        assertTrue(obj.getRequestId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRequestReferences obj = new SoRequestReferences();
-
-        obj.setInstanceId("instanceId");
-        assertEquals("instanceId", obj.getInstanceId());
-        
-        obj.setRequestId("requestId");
-        assertEquals("requestId", obj.getRequestId());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java
deleted file mode 100755
index 39a3241a3..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoRequestStatusTest {
-
-    @Test
-    public void testConstructor() {
-        SoRequestStatus obj = new SoRequestStatus();
-
-        assertEquals(0, obj.getPercentProgress());
-        assertTrue(obj.getRequestState() == null);
-        assertTrue(obj.getTimestamp() == null);
-        assertFalse(obj.isWasRolledBack());
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRequestStatus obj = new SoRequestStatus();
-
-        obj.setPercentProgress(2008);
-        assertEquals(2008, obj.getPercentProgress());
-
-        obj.setRequestState("requestState");
-        assertEquals("requestState", obj.getRequestState());
-
-        obj.setTimestamp("timestamp");
-        assertEquals("timestamp", obj.getTimestamp());
-
-        obj.setWasRolledBack(true);
-        assertTrue(obj.isWasRolledBack());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
deleted file mode 100755
index 971b1d190..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.time.LocalDateTime;
-import java.util.UUID;
-
-import org.junit.Test;
-
-public class SoRequestTest {
-
-    @Test
-    public void testConstructor() {
-        SoRequest obj = new SoRequest();
-
-        assertTrue(obj.getFinishTime() == null);
-        assertTrue(obj.getRequestDetails() == null);
-        assertTrue(obj.getRequestId() == null);
-        assertTrue(obj.getRequestScope() == null);
-        assertTrue(obj.getRequestStatus() == null);
-        assertTrue(obj.getRequestType() == null);
-        assertTrue(obj.getStartTime() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoRequest obj = new SoRequest();
-
-        LocalDateTime finishTime = LocalDateTime.now();
-        obj.setFinishTime(finishTime);
-        assertEquals(finishTime, obj.getFinishTime());
-
-        UUID uuid = UUID.randomUUID();
-        obj.setRequestId(uuid);
-        assertEquals(uuid, obj.getRequestId());
-
-        obj.setRequestScope("requestScope");
-        assertEquals("requestScope", obj.getRequestScope());
-
-        SoRequestStatus requestStatus = new SoRequestStatus();
-        obj.setRequestStatus(requestStatus);
-        assertEquals(requestStatus, obj.getRequestStatus());
-
-        obj.setRequestType("requestType");
-        assertEquals("requestType", obj.getRequestType());
-
-        obj.setOperationType(SoOperationType.DELETE_VF_MODULE);
-        assertEquals(SoOperationType.DELETE_VF_MODULE, obj.getOperationType());
-
-        LocalDateTime startTime = LocalDateTime.now();
-        obj.setStartTime(startTime.toString());
-        assertEquals(startTime.toString(), obj.getStartTime());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java
deleted file mode 100755
index c932ac969..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoResponseTest {
-
-    @Test
-    public void testConstructor() {
-        SoResponse obj = new SoResponse();
-
-        assertEquals(0, obj.getHttpResponseCode());
-        assertTrue(obj.getRequest() == null);
-        assertTrue(obj.getRequestError() == null);
-        assertTrue(obj.getRequestReferences() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoResponse obj = new SoResponse();
-
-        obj.setHttpResponseCode(2008);
-        assertEquals(2008, obj.getHttpResponseCode());
-
-        SoRequest request = new SoRequest();
-        obj.setRequest(request);
-        assertEquals(request, obj.getRequest());
-
-        SoRequestError requestError = new SoRequestError();
-        obj.setRequestError(requestError);
-        assertEquals(requestError, obj.getRequestError());
-
-        SoRequestReferences requestReferences = new SoRequestReferences();
-        obj.setRequestReferences(requestReferences);
-        assertEquals(requestReferences, obj.getRequestReferences());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
deleted file mode 100755
index 26bd75d2a..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * Copyright (C) 2018-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.policy.so;
-
-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 java.util.UUID;
-
-import org.junit.Test;
-
-public class SoResponseWrapperTest {
-
-    @Test
-    public void testConstructor() {
-        SoResponse response = new SoResponse();
-        SoResponseWrapper obj = new SoResponseWrapper(response, "reqID");
-
-        assertEquals(response, obj.getSoResponse());
-        assertEquals("reqID", obj.getRequestId());
-    }
-
-    @Test
-    public void testSetGet() {
-        SoResponse response = new SoResponse();
-        SoResponseWrapper obj = new SoResponseWrapper(response, "reqID");
-
-        SoResponse response2 = new SoResponse();
-        response2.setHttpResponseCode(2008);
-        obj.setSoResponse(response2);
-        assertEquals(response2, obj.getSoResponse());
-
-        obj.setRequestId("id2");
-        assertEquals("id2", obj.getRequestId());
-    }
-
-    @Test
-    public void testSoResponseWrapperMethods() {
-        String requestId = UUID.randomUUID().toString();
-        SoResponse response = new SoResponse();
-
-        SoResponseWrapper responseWrapper = new SoResponseWrapper(response, requestId);
-        assertNotNull(responseWrapper);
-        assertNotEquals(0, responseWrapper.hashCode());
-
-        assertEquals(response, responseWrapper.getSoResponse());
-
-        assertNotEquals(0, responseWrapper.hashCode());
-
-        assertEquals("SOResponseWrapper [SOResponse=org.onap.policy.", responseWrapper.toString().substring(0,  46));
-
-        SoResponseWrapper identicalResponseWrapper = new SoResponseWrapper(response, requestId);
-
-        assertEquals(responseWrapper,  responseWrapper);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        assertNotEquals(null, responseWrapper);
-        assertNotEquals("Hello", responseWrapper);
-        assertFalse(responseWrapper.equals(null));
-        assertFalse(responseWrapper.equals("AString"));
-        
-        assertEquals(new SoResponseWrapper(null, null), new SoResponseWrapper(null, null));
-        assertNotEquals(new SoResponseWrapper(null, null), identicalResponseWrapper);
-        
-        assertNotEquals(0, new SoResponseWrapper(null, null).hashCode());
-
-        identicalResponseWrapper.setSoResponse(new SoResponse());
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setSoResponse(response);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        
-        identicalResponseWrapper.setRequestId(UUID.randomUUID().toString());
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setRequestId(requestId);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        
-        responseWrapper.setRequestId(null);
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setRequestId(null);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        responseWrapper.setRequestId(requestId);
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setRequestId(requestId);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java
deleted file mode 100755
index 8c9d3a730..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoServiceExceptionHolderTest {
-
-    @Test
-    public void testConstructor() {
-        SoServiceExceptionHolder obj = new SoServiceExceptionHolder();
-
-        assertTrue(obj.getMessageId() == null);
-        assertTrue(obj.getText() == null);
-        assertTrue(obj.getVariables() != null);
-        assertEquals(0, obj.getVariables().size());
-    }
-
-    @Test
-    public void testSetGet() {
-        SoServiceExceptionHolder obj = new SoServiceExceptionHolder();
-
-        obj.setMessageId("messageId");
-        assertEquals("messageId", obj.getMessageId());
-
-        obj.setText("text");
-        assertEquals("text", obj.getText());
-    }
-}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java
deleted file mode 100755
index e68e74e3f..000000000
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * Modifications 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.policy.so;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class SoSubscriberInfoTest {
-
-    @Test
-    public void testConstructor() {
-        SoSubscriberInfo obj = new SoSubscriberInfo();
-
-        assertTrue(obj.getGlobalSubscriberId() == null);
-        assertTrue(obj.getSubscriberCommonSiteId() == null);
-        assertTrue(obj.getSubscriberName() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SoSubscriberInfo obj = new SoSubscriberInfo();
-
-        obj.setGlobalSubscriberId("globalSubscriberId");
-        assertEquals("globalSubscriberId", obj.getGlobalSubscriberId());
-
-        obj.setSubscriberCommonSiteId("subscriberCommonSiteId");
-        assertEquals("subscriberCommonSiteId", obj.getSubscriberCommonSiteId());
-        
-        obj.setSubscriberName("subscriberName");
-        assertEquals("subscriberName", obj.getSubscriberName());
-    }
-}
author	Jim Hahn <jrh3@att.com>	2019-05-08 14:33:57 -0400
committer	Jim Hahn <jrh3@att.com>	2019-05-08 16:24:35 -0400
commit	10b21aae2bde224ab7f91f4b5ab1b89369c8fd1c (patch)
tree	0417099e379e8be69f90221e8fd066fc40def62b /controlloop/common/model-impl/so/src/test
parent	01841878936986bc80a974977ccdeaceaf7f9a78 (diff)