Master lab template changes for MSO rename to SO

Issue-ID: POLICY-162

Change-Id: Ieb0952379cd854e0ed8e4a3b068b7e29f3b93770
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>

diff --git a/controlloop/packages/basex/src/files/config/controlloop.properties.environment b/controlloop/packages/basex/src/files/config/controlloop.properties.environment
index c77746f..34684ae 100644 (file)
--- a/controlloop/packages/basex/src/files/config/controlloop.properties.environment
+++ b/controlloop/packages/basex/src/files/config/controlloop.properties.environment
@@ -26,9 +26,9 @@ aai.url=${{AAI_URL}}
 aai.username=${{AAI_USERNAME}}
 aai.password=${{AAI_PASSWORD}}
 
-mso.url=${{MSO_URL}}
-mso.username=${{MSO_USERNAME}}
-mso.password=${{MSO_PASSWORD}}
+so.url=${{SO_URL}}
+so.username=${{SO_USERNAME}}
+so.password=${{SO_PASSWORD}}
 
 vfc.url=${{VFC_URL}}
 vfc.username=${{VFC_USERNAME}}

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
index 74d79f4..e0a967f 100644 (file)
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
@@ -70,7 +70,7 @@
                </dependency>
                <dependency>
                        <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>mso</artifactId>
+                       <artifactId>so</artifactId>
                        <version>${dependenciesVersion}</version>
                </dependency>   
                <dependency>
@@ -115,7 +115,7 @@
                </dependency>
                <dependency>
                        <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.mso</artifactId>
+                       <artifactId>actor.so</artifactId>
                        <version>${dependenciesVersion}</version>
                </dependency>
                <dependency>

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index 9cf395d..3e4f76c 100644 (file)
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -31,7 +31,7 @@ import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager;
 import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager.NEW_EVENT_STATUS;
 import org.onap.policy.controlloop.eventmanager.ControlLoopOperationManager;
-import org.onap.policy.controlloop.actor.mso.MSOActorServiceProvider;
+import org.onap.policy.controlloop.actor.so.SOActorServiceProvider;
 import org.onap.policy.appc.Request;
 import org.onap.policy.appc.Response;
 import org.onap.policy.appc.CommonHeader;
@@ -42,17 +42,17 @@ import org.onap.policy.appclcm.LCMResponse;
 import org.onap.policy.appclcm.LCMCommonHeader;
 import org.onap.policy.vfc.VFCRequest;
 import org.onap.policy.vfc.VFCManager;
-import org.onap.policy.mso.SOManager;
-import org.onap.policy.mso.SORequest;
-import org.onap.policy.mso.SORequestStatus;
-import org.onap.policy.mso.SORequestDetails;
-import org.onap.policy.mso.SOModelInfo;
-import org.onap.policy.mso.SOCloudConfiguration;
-import org.onap.policy.mso.SORequestInfo;
-import org.onap.policy.mso.SORequestParameters;
-import org.onap.policy.mso.SORelatedInstanceListElement;
-import org.onap.policy.mso.SORelatedInstance;
-import org.onap.policy.mso.SOResponse;
+import org.onap.policy.so.SOManager;
+import org.onap.policy.so.SORequest;
+import org.onap.policy.so.SORequestStatus;
+import org.onap.policy.so.SORequestDetails;
+import org.onap.policy.so.SOModelInfo;
+import org.onap.policy.so.SOCloudConfiguration;
+import org.onap.policy.so.SORequestInfo;
+import org.onap.policy.so.SORequestParameters;
+import org.onap.policy.so.SORelatedInstanceListElement;
+import org.onap.policy.so.SORelatedInstance;
+import org.onap.policy.so.SOResponse;
 import org.onap.policy.guard.PolicyGuard;
 import org.onap.policy.guard.PolicyGuard.LockResult;
 import org.onap.policy.guard.TargetLock;
@@ -522,7 +522,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
               
               if(request instanceof SORequest) {
                   // Call SO. The response will be inserted into memory once it's received 
-                  MSOActorServiceProvider.sendRequest(drools.getWorkingMemory(), request);                        
+                  SOActorServiceProvider.sendRequest(drools.getWorkingMemory(), request);                        
               }
               break;
           case "VFC":

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/test/resources/projects/basic/archetype.properties b/controlloop/templates/archetype-cl-amsterdam/src/test/resources/projects/basic/archetype.properties
index 92bcb43..8cc10c9 100644 (file)
--- a/controlloop/templates/archetype-cl-amsterdam/src/test/resources/projects/basic/archetype.properties
+++ b/controlloop/templates/archetype-cl-amsterdam/src/test/resources/projects/basic/archetype.properties
@@ -38,6 +38,6 @@ aaiUsername=policy
 aaiPassword=policy
 aaiNamedQueryUUID=d925ed73-8231-4d02-9545-db4e101fffff
 aaiPatternMatch=false
-msoURL=http://localhost:8080/TestREST/Test
-msoUsername=policy
-msoPassword=policy
+soURL=http://localhost:8080/TestREST/Test
+soUsername=policy
+soPassword=policy