Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
AT&T 1712 and 1802 release code
[so.git] / bpmn / MSOInfrastructureBPMN / src / test / groovy / org / openecomp / mso / bpmn / vcpe / scripts / DoCreateAllottedResourceTXCTest.groovy
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
index 026c490..e1fc143 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
@@ -18,20 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 package org.openecomp.mso.bpmn.vcpe.scripts
-\r
-\r
-import org.camunda.bpm.engine.ProcessEngineServices\r
-import org.camunda.bpm.engine.RepositoryService\r
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
-import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+
+
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
 import org.junit.Before
-import org.junit.BeforeClass\r
-import org.junit.Rule\r
+import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
-import org.junit.Ignore\r
+import org.junit.Ignore
 import org.mockito.MockitoAnnotations
-import org.camunda.bpm.engine.delegate.BpmnError\r
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.mock.FileUtil
 
@@ -39,7 +38,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
 import static com.github.tomakehurst.wiremock.client.WireMock.put
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetAllottedResource
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchAllottedResource
@@ -51,28 +50,24 @@ import java.util.Map
 import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule\r
-\r
-class DoCreateAllottedResourceTXCTest extends GroovyTestBase {\r
-       \r
-       @Rule\r
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
+       
+       @Rule
        public WireMockRule wireMockRule = new WireMockRule(PORT)
-\r
-       String Prefix = "DCARTXC_"\r
+
+       String Prefix = "DCARTXC_"
 
        @BeforeClass
        public static void setUpBeforeClass() {
-               def fr = new FileReader("src/test/resources/mso.bpmn.urn.properties")
-               urnProps.load(fr)
-               fr.close()
-               
-               aaiUriPfx = urnProps.get("aai.endpoint")
+               // nothing for now
        }
-         \r
-    @Before\r
-       public void init()\r
-       {\r
-               MockitoAnnotations.initMocks(this)\r
+         
+    @Before
+       public void init()
+       {
+               MockitoAnnotations.initMocks(this)
        }
        
        public DoCreateAllottedResourceTXCTest() {
@@ -80,34 +75,35 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        
-       // ***** preProcessRequest *****\r
-                       \r
-       @Test\r
-       @Ignore  \r
-       public void preProcessRequest() {\r
+       // ***** preProcessRequest *****
+                       
+       @Test
+       // @Ignore  
+       public void preProcessRequest() {
                ExecutionEntity mex = setupMock()
                initPreProcess(mex)
-               \r
-               DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()\r
-               DoCreateAllottedResourceTXC.preProcessRequest(mex)\r
-\r
-               verify(mex).getVariable(DBGFLAG)\r
-               verify(mex).setVariable("prefix", Prefix)\r
+               
+               DoCreateAllottedResourceTXC DoCreateAllottedResourceTXC = new DoCreateAllottedResourceTXC()
+               DoCreateAllottedResourceTXC.preProcessRequest(mex)
+
+               verify(mex).getVariable(DBGFLAG)
+               verify(mex).setVariable("prefix", Prefix)
                                
                assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
+               assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdnc_replication_delay"))
                assertTrue(checkMissingPreProcessRequest("serviceInstanceId"))
                assertTrue(checkMissingPreProcessRequest("parentServiceInstanceId"))
                assertTrue(checkMissingPreProcessRequest("allottedResourceModelInfo"))
                assertTrue(checkMissingPreProcessRequest("brgWanMacAddress"))
                assertTrue(checkMissingPreProcessRequest("allottedResourceRole"))
-               assertTrue(checkMissingPreProcessRequest("allottedResourceType"))\r
+               assertTrue(checkMissingPreProcessRequest("allottedResourceType"))
        }
        
        
        // ***** getAaiAR *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void getAaiAR() {
                MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
                
@@ -121,7 +117,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void getAaiAR_Duplicate() {
                MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
                
@@ -137,7 +133,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void getAaiAR_NotActive() {
                MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
                
@@ -153,7 +149,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void getAaiAR_NoStatus() {
                MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
                
@@ -172,7 +168,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** createAaiAR *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void createAaiAR() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -196,7 +192,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void createAaiAR_NoArid_NoModelUuids() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -226,7 +222,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void createAaiAR_MissingPsiLink() {
                ExecutionEntity mex = setupMock()
                initCreateAaiAr(mex)
@@ -241,7 +237,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void createAaiAR_HttpFailed() {
                ExecutionEntity mex = setupMock()
                initCreateAaiAr(mex)
@@ -254,7 +250,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void createAaiAR_BpmnError() {
                ExecutionEntity mex = setupMock()
                initCreateAaiAr(mex)
@@ -269,7 +265,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void createAaiAR_Ex() {
                ExecutionEntity mex = setupMock()
                initCreateAaiAr(mex)
@@ -287,7 +283,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** buildSDNCRequest *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void buildSDNCRequest() {
                ExecutionEntity mex = setupMock()
                initBuildSDNCRequest(mex)
@@ -300,8 +296,10 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
                assertTrue(result.indexOf("<sdncadapter:SvcAction>myact</") >= 0)
                assertTrue(result.indexOf("<allotted-resource-id>ari</") >= 0)
                assertTrue(result.indexOf("<sdncadapter:SvcInstanceId>sii</") >= 0)
-               assertTrue(result.indexOf("<service-instance-id>psii</") >= 0)
+               assertTrue(result.indexOf("<service-instance-id>sii</") >= 0)
                assertTrue(result.indexOf("<parent-service-instance-id>psii</") >= 0)
+               assertTrue(result.indexOf("<subscription-service-type>sst</") >= 0)
+               assertTrue(result.indexOf("<global-customer-id>gci</") >= 0)
                assertTrue(result.indexOf("<sdncadapter:CallbackUrl>scu</") >= 0)
                assertTrue(result.indexOf("<request-id>mri</") >= 0)
                assertTrue(result.indexOf("<model-invariant-uuid/>") >= 0)
@@ -312,7 +310,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void buildSDNCRequest_Ex() {
                ExecutionEntity mex = setupMock()
                initBuildSDNCRequest(mex)
@@ -328,7 +326,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** preProcessSDNCAssign *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCAssign() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -354,7 +352,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCAssign_BpmnError() {
                ExecutionEntity mex = setupMock()
                initPreProcessSDNC(mex)
@@ -367,7 +365,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCAssign_Ex() {
                ExecutionEntity mex = setupMock()
                initPreProcessSDNC(mex)
@@ -383,7 +381,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** preProcessSDNCCreate *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCCreate() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -410,7 +408,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCCreate_BpmnError() {
                ExecutionEntity mex = setupMock()
                initPreProcessSDNC(mex)
@@ -423,7 +421,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCCreate_Ex() {
                ExecutionEntity mex = setupMock()
                initPreProcessSDNC(mex)
@@ -439,7 +437,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** preProcessSDNCActivate *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCActivate() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -466,7 +464,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCActivate_BpmnError() {
                ExecutionEntity mex = setupMock()
                initPreProcessSDNC(mex)
@@ -479,7 +477,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCActivate_Ex() {
                ExecutionEntity mex = setupMock()
                initPreProcessSDNC(mex)
@@ -495,7 +493,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** validateSDNCResp *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void validateSDNCResp() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -519,7 +517,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void validateSDNCResp_Get() {
                ExecutionEntity mex = setupMock()
                def data = initValidateSDNCResp(mex)
@@ -538,7 +536,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void validateSDNCResp_Unsuccessful() {
                ExecutionEntity mex = setupMock()
                initValidateSDNCResp(mex)
@@ -553,7 +551,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void validateSDNCResp_BpmnError() {
                ExecutionEntity mex = setupMock()
                initValidateSDNCResp(mex)
@@ -567,7 +565,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void validateSDNCResp_Ex() {
                ExecutionEntity mex = setupMock()
                initValidateSDNCResp(mex)
@@ -584,7 +582,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** preProcessSDNCGet *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCGet_FoundAR() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -603,7 +601,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCGet_NotFoundAR() {
                ExecutionEntity mex = setupMock()
                def map = setupMap(mex)
@@ -624,7 +622,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessSDNCGet_Ex() {
                ExecutionEntity mex = setupMock()
                initPreProcessSDNCGet(mex)
@@ -640,7 +638,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** updateAaiAROrchStatus *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void updateAaiAROrchStatus() {
                MockPatchAllottedResource(CUST, SVC, INST, ARID)
                
@@ -655,7 +653,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** generateOutputs *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void generateOutputs() {
                ExecutionEntity mex = setupMock()
                def txctop = FileUtil.readResourceFile("__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml")
@@ -674,7 +672,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void generateOutputs_BadXml() {
                ExecutionEntity mex = setupMock()
                
@@ -689,7 +687,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void generateOutputs_BpmnError() {
                ExecutionEntity mex = setupMock()
                
@@ -704,7 +702,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void generateOutputs_Ex() {
                ExecutionEntity mex = setupMock()
                
@@ -722,7 +720,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** preProcessRollback *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessRollback() {
                ExecutionEntity mex = setupMock()
                WorkflowException wfe = mock(WorkflowException.class)
@@ -738,7 +736,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessRollback_NotWFE() {
                ExecutionEntity mex = setupMock()
                
@@ -753,7 +751,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessRollback_BpmnError() {
                ExecutionEntity mex = setupMock()
                
@@ -767,7 +765,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void preProcessRollback_Ex() {
                ExecutionEntity mex = setupMock()
                
@@ -784,7 +782,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        // ***** postProcessRollback *****
        
        @Test
-       @Ignore
+       // @Ignore
        public void postProcessRollback() {
                ExecutionEntity mex = setupMock()
                WorkflowException wfe = mock(WorkflowException.class)
@@ -801,7 +799,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void postProcessRollback_NotWFE() {
                ExecutionEntity mex = setupMock()
                
@@ -817,7 +815,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void postProcessRollback_BpmnError() {
                ExecutionEntity mex = setupMock()
                
@@ -832,7 +830,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        }
        
        @Test
-       @Ignore
+       // @Ignore
        public void postProcessRollback_Ex() {
                ExecutionEntity mex = setupMock()
                
@@ -860,6 +858,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        private void initPreProcess(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
                when(mex.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("sdncurn")
+               when(mex.getVariable("URN_mso_workflow_sdnc_replication_delay")).thenReturn("sdncdelay")
                when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
                when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
                when(mex.getVariable("allottedResourceModelInfo")).thenReturn("armi")
@@ -903,6 +902,8 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
                when(mex.getVariable("allottedResourceId")).thenReturn("ari")
                when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
                when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
+               when(mex.getVariable("subscriptionServiceType")).thenReturn("sst")
+               when(mex.getVariable("globalCustomerId")).thenReturn("gci")
                when(mex.getVariable("sdncCallbackUrl")).thenReturn("scu")
                when(mex.getVariable("msoRequestId")).thenReturn("mri")
        }
@@ -923,7 +924,6 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
                when(mex.getVariable("aaiARGetResponse")).thenReturn("<selflink>arlink</selflink>")
                when(mex.getVariable("sdncAssignResponse")).thenReturn("<response-data>&lt;object-path&gt;assignlink&lt;/object-path&gt;</response-data>")
                when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
-               when(mex.getVariable("junitSleepMs")).thenReturn("5")
                when(mex.getVariable("sdncCallbackUrl")).thenReturn("myurl")
        }
        
@@ -945,6 +945,6 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
        private initUpdateAaiAROrchStatus(ExecutionEntity mex) {
                when(mex.getVariable(DBGFLAG)).thenReturn("true")
                when(mex.getVariable("aaiARPath")).thenReturn(aaiUriPfx + "/aai/v9/business/customers/customer/"+CUST+"/service-subscriptions/service-subscription/"+SVC+"/service-instances/service-instance/"+INST+"/allotted-resources/allotted-resource/"+ARID)
-       }\r
-               \r
+       }
+               
 }
Service Orchestrator