From 8d496b4f1516d25e39bbd909cb7185e74a453cc6 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Mon, 6 Nov 2017 10:27:21 -0500
Subject: Updated xml tags and moved sleep to bpmn

Per issue, changed "_" to "-".  Also related to a comment to SO-303,
made "sleep" time a property and moved the sleep calls from groovy
scripts to bpmn.
Fixed a few test resources that still had "_" instead of "-".  Changed
variable name from sdnReplDelay to sdncReplDelay.

Change-Id: I893254c0ab735508732fcf2c3e82934f26c2a05a
Issue-Id: SO-308
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml    | 4 ++--
 .../VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml    | 4 ++--
 bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/test/resources')

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
index 9b201d9808..05583cd7aa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
@@ -16,8 +16,8 @@
     </allotted-resource-identifiers>
     <tunnelxconn-assignments>
     	<vni>my-vni</vni>
-    	<vgmux_bearer_ip>my-bearer-ip</vgmux_bearer_ip>
-    	<vgmux_lan_ip>my-lan-ip</vgmux_lan_ip>
+    	<vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>
+    	<vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>
     </tunnelxconn-assignments>
 </tunnelxconn-topology>
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
index 9b201d9808..05583cd7aa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
@@ -16,8 +16,8 @@
     </allotted-resource-identifiers>
     <tunnelxconn-assignments>
     	<vni>my-vni</vni>
-    	<vgmux_bearer_ip>my-bearer-ip</vgmux_bearer_ip>
-    	<vgmux_lan_ip>my-lan-ip</vgmux_lan_ip>
+    	<vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>
+    	<vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>
     </tunnelxconn-assignments>
 </tunnelxconn-topology>
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
index aad79b00f0..325ee3ce97 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -40,6 +40,8 @@ mso.sdnc.timeout.ucpe.async.hours=120
 mso.sdnc.timeout.ucpe.async.minutes=5
 mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage
 mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService
+mso.workflow.sdnc.replication.delay=PT0.01S
+mso.workflow.aai.distribution.delay=PT0.01S
 
 mso.catalog.db.endpoint=http://localhost:28090
 
-- 
cgit 1.2.3-korg