JIRA: DOMINO-25

Test script updated to test new API features
TUID query
TUID based publishing

Change-Id: Iceeb048f0fef40fafb24a08f44e16e9cdea657c0
Signed-off-by: Ulas Kozat <ulas.kozat@gmail.com>

diff --git a/DominoClient.py b/DominoClient.py
index 3d29665..32d1433 100755 (executable)
--- a/DominoClient.py
+++ b/DominoClient.py
@@ -127,7 +127,7 @@ class CLIHandler:
     self.CLIservice = CLIservice
 
   def d_CLI(self, msg):
-    logging.info('Received CLI %s', msg.CLI_input)
+    #logging.info('Received CLI %s', msg.CLI_input) #breaks testing due to random TUIDs
 
     CLIrespmsg = CLIResponse()
     CLIrespmsg.CLI_response = self.CLIservice.process_input(msg.CLI_input)

diff --git a/tests/logdata/client1.log b/tests/logdata/client1.log
index f7544df..e74f6b7 100644 (file)
--- a/tests/logdata/client1.log
+++ b/tests/logdata/client1.log
@@ -1,33 +1,26 @@
-02/06/2017 06:36:52 AM Domino Client Starting...
-02/06/2017 06:36:52 AM 1 Sending Registration
-02/06/2017 06:36:52 AM Registration Response: Response Code: 1
-02/06/2017 06:36:52 AM CLI Service is starting
-02/06/2017 06:36:52 AM RPC service for CLI is starting...
-02/06/2017 06:36:54 AM Received CLI ['heartbeat']
-02/06/2017 06:36:54 AM 12345678123456781234567812345678 Sending heartbeat
-02/06/2017 06:36:54 AM heart beat received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 2
-02/06/2017 06:36:55 AM Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1']
-02/06/2017 06:36:55 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot']
-02/06/2017 06:36:55 AM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 3
-02/06/2017 06:36:56 AM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE']
-02/06/2017 06:36:56 AM subscribing labels [] and templates ['dummy1', 'dummy2']
-02/06/2017 06:36:56 AM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 4
-02/06/2017 06:36:57 AM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE']
-02/06/2017 06:36:57 AM subscribing labels [] and templates ['dummy1', 'dummy2']
-02/06/2017 06:36:57 AM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 5
-02/06/2017 06:36:58 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2']
-02/06/2017 06:36:58 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates []
-02/06/2017 06:36:58 AM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 6
-02/06/2017 06:36:59 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE']
-02/06/2017 06:36:59 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
-02/06/2017 06:36:59 AM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 7
-02/06/2017 06:37:01 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE']
-02/06/2017 06:37:01 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
-02/06/2017 06:37:01 AM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 8
-02/06/2017 06:37:02 AM Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml']
-02/06/2017 06:37:02 AM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml
-02/06/2017 06:37:02 AM Publish Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 9 Status: 2
-02/06/2017 06:37:03 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1']
-02/06/2017 06:37:03 AM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates []
-02/06/2017 06:37:03 AM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 10
-02/06/2017 06:37:04 AM 12345678123456781234567812345678 Received Template File
+02/17/2017 03:27:55 PM Domino Client Starting...
+02/17/2017 03:27:55 PM 1 Sending Registration
+02/17/2017 03:27:55 PM Registration Response: Response Code: 1
+02/17/2017 03:27:55 PM CLI Service is starting
+02/17/2017 03:27:55 PM RPC service for CLI is starting...
+02/17/2017 03:27:57 PM 12345678123456781234567812345678 Sending heartbeat
+02/17/2017 03:27:57 PM heart beat received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 2
+02/17/2017 03:27:58 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot']
+02/17/2017 03:27:58 PM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 3
+02/17/2017 03:27:59 PM subscribing labels [] and templates ['dummy1', 'dummy2']
+02/17/2017 03:27:59 PM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 4
+02/17/2017 03:28:01 PM subscribing labels [] and templates ['dummy1', 'dummy2']
+02/17/2017 03:28:01 PM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 5
+02/17/2017 03:28:02 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates []
+02/17/2017 03:28:02 PM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 6
+02/17/2017 03:28:03 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
+02/17/2017 03:28:03 PM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 7
+02/17/2017 03:28:04 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
+02/17/2017 03:28:04 PM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 8
+02/17/2017 03:28:05 PM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml
+02/17/2017 03:28:05 PM Publish Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 9 Status: 2
+02/17/2017 03:28:06 PM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates []
+02/17/2017 03:28:06 PM Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 10
+02/17/2017 03:28:07 PM 12345678123456781234567812345678 Received Template File
+02/17/2017 03:28:09 PM 12345678123456781234567812345678 Received Template File
+02/17/2017 03:28:09 PM IGNORING error: ERRNO 17; ./toscafiles/12345678123456781234567812345678 exists.

diff --git a/tests/logdata/server.log b/tests/logdata/server.log
index c017d54..e7dcd78 100644 (file)
--- a/tests/logdata/server.log
+++ b/tests/logdata/server.log
@@ -1,45 +1,57 @@
-02/06/2017 06:36:52 AM Domino Server Starting...
-02/06/2017 06:36:52 AM Registration Request received for UUID 12345678123456781234567812345678 from IP: 172.16.42.2 port: 9091
-02/06/2017 06:36:53 AM Registration Request received for UUID 12345678123456781234567812345678 from IP: 172.16.42.2 port: 9092
-02/06/2017 06:36:54 AM heartbeat received from 12345678123456781234567812345678
-02/06/2017 06:36:55 AM Subscribe Request received from 12345678123456781234567812345678
-02/06/2017 06:36:55 AM APPENDING Labels...
-02/06/2017 06:36:55 AM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
-02/06/2017 06:36:56 AM Subscribe Request received from 12345678123456781234567812345678
-02/06/2017 06:36:56 AM APPENDING Labels...
-02/06/2017 06:36:56 AM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
-02/06/2017 06:36:57 AM Subscribe Request received from 12345678123456781234567812345678
-02/06/2017 06:36:57 AM APPENDING Labels...
-02/06/2017 06:36:57 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
-02/06/2017 06:36:58 AM Subscribe Request received from 12345678123456781234567812345678
-02/06/2017 06:36:58 AM APPENDING Labels...
-02/06/2017 06:36:58 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1'])
-02/06/2017 06:36:59 AM Subscribe Request received from 12345678123456781234567812345678
-02/06/2017 06:36:59 AM OVERWRITING Labels...
-02/06/2017 06:36:59 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3'])
-02/06/2017 06:37:01 AM Subscribe Request received from 12345678123456781234567812345678
-02/06/2017 06:37:01 AM DELETING Labels...
-02/06/2017 06:37:01 AM Supported Template: set([]) Supported Labels: set([])
-02/06/2017 06:37:02 AM Publish Request received from 12345678123456781234567812345678
-02/06/2017 06:37:02 AM Node Labels: {'VNF2': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF3': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF1': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])}
-02/06/2017 06:37:02 AM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])}
-02/06/2017 06:37:02 AM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []}
-02/06/2017 06:37:02 AM Per domain file paths: {}
-02/06/2017 06:37:02 AM Per domain topologies: {}
-02/06/2017 06:37:02 AM Boundary VLs: {}
-02/06/2017 06:37:02 AM VL sites: {}
-02/06/2017 06:37:02 AM Subscribers: [] for TUID: 5105955fa64f44db96b5e3ac57d224e6
-02/06/2017 06:37:03 AM Subscribe Request received from 12345678123456781234567812345678
-02/06/2017 06:37:03 AM APPENDING Labels...
-02/06/2017 06:37:03 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])
-02/06/2017 06:37:04 AM Publish Request received from 3b49733eca51447c8e4bd6028f6f45b6
-02/06/2017 06:37:04 AM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml
-02/06/2017 06:37:04 AM Node Labels: {'VNF2': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF3': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF1': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])}
-02/06/2017 06:37:04 AM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set(['12345678123456781234567812345678'])}
-02/06/2017 06:37:04 AM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': '12345678123456781234567812345678'}
-02/06/2017 06:37:04 AM Per domain file paths: {'12345678123456781234567812345678': './toscafiles/template_part12345678123456781234567812345678.yaml'}
-02/06/2017 06:37:04 AM Per domain topologies: {'12345678123456781234567812345678': {'policy_types': {'tosca.policies.Placement.Geolocation': {'description': 'Geolocation policy', 'derived_from': 'tosca.policies.Placement'}}, 'tosca_definitions_version': 'tosca_simple_profile_for_nfv_1_0_0', 'description': 'Template for deploying a single server with predefined properties.', 'topology_template': {'node_templates': {'VNF1': {'type': 'tosca.nodes.nfv.VNF', 'properties': {'version': 1.0, 'vendor': 'acmetelco', 'id': 'vnf1'}}}, 'policies': [{'rule1': {'type': 'tosca.policies.Placement.Geolocation', 'targets': ['VNF1'], 'properties': {'region': ['us-west-1']}}}]}, 'metadata': {'template_name': 'TOSCA NFV Sample Template'}}}
-02/06/2017 06:37:04 AM Boundary VLs: {}
-02/06/2017 06:37:04 AM VL sites: {}
-02/06/2017 06:37:04 AM Push Response received from 12345678123456781234567812345678
-02/06/2017 06:37:04 AM Subscribers: ['12345678123456781234567812345678'] for TUID: c520de762fb44803b99170e34c3dc21a
+02/17/2017 03:27:55 PM Domino Server Starting...
+02/17/2017 03:27:55 PM Registration Request received for UUID 12345678123456781234567812345678 from IP: 192.168.253.33 port: 9091
+02/17/2017 03:27:56 PM Registration Request received for UUID 12345678123456781234567812345678 from IP: 192.168.253.33 port: 9092
+02/17/2017 03:27:57 PM heartbeat received from 12345678123456781234567812345678
+02/17/2017 03:27:58 PM Subscribe Request received from 12345678123456781234567812345678
+02/17/2017 03:27:58 PM APPENDING Labels...
+02/17/2017 03:27:58 PM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
+02/17/2017 03:27:59 PM Subscribe Request received from 12345678123456781234567812345678
+02/17/2017 03:27:59 PM APPENDING Labels...
+02/17/2017 03:27:59 PM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
+02/17/2017 03:28:01 PM Subscribe Request received from 12345678123456781234567812345678
+02/17/2017 03:28:01 PM APPENDING Labels...
+02/17/2017 03:28:01 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
+02/17/2017 03:28:02 PM Subscribe Request received from 12345678123456781234567812345678
+02/17/2017 03:28:02 PM APPENDING Labels...
+02/17/2017 03:28:02 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1'])
+02/17/2017 03:28:03 PM Subscribe Request received from 12345678123456781234567812345678
+02/17/2017 03:28:03 PM OVERWRITING Labels...
+02/17/2017 03:28:03 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3'])
+02/17/2017 03:28:04 PM Subscribe Request received from 12345678123456781234567812345678
+02/17/2017 03:28:04 PM DELETING Labels...
+02/17/2017 03:28:04 PM Supported Template: set([]) Supported Labels: set([])
+02/17/2017 03:28:05 PM Publish Request received from 12345678123456781234567812345678
+02/17/2017 03:28:05 PM Node Labels: {'VNF2': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF3': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF1': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])}
+02/17/2017 03:28:05 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])}
+02/17/2017 03:28:05 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []}
+02/17/2017 03:28:05 PM Per domain file paths: {}
+02/17/2017 03:28:05 PM Per domain topologies: {}
+02/17/2017 03:28:05 PM Boundary VLs: {}
+02/17/2017 03:28:05 PM VL sites: {}
+02/17/2017 03:28:05 PM Subscribers: [] for TUID: 8400d1b81f704e08b5eea4065ab1123b
+02/17/2017 03:28:06 PM Subscribe Request received from 12345678123456781234567812345678
+02/17/2017 03:28:06 PM APPENDING Labels...
+02/17/2017 03:28:06 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])
+02/17/2017 03:28:07 PM Publish Request received from 9d2a14da97cb4d17b25a729266ea5789
+02/17/2017 03:28:07 PM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml
+02/17/2017 03:28:07 PM Node Labels: {'VNF2': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF3': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF1': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])}
+02/17/2017 03:28:07 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set(['12345678123456781234567812345678'])}
+02/17/2017 03:28:07 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': '12345678123456781234567812345678'}
+02/17/2017 03:28:07 PM Per domain file paths: {'12345678123456781234567812345678': './toscafiles/template_part12345678123456781234567812345678.yaml'}
+02/17/2017 03:28:07 PM Per domain topologies: {'12345678123456781234567812345678': {'policy_types': {'tosca.policies.Placement.Geolocation': {'description': 'Geolocation policy', 'derived_from': 'tosca.policies.Placement'}}, 'tosca_definitions_version': 'tosca_simple_profile_for_nfv_1_0_0', 'description': 'Template for deploying a single server with predefined properties.', 'topology_template': {'node_templates': {'VNF1': {'type': 'tosca.nodes.nfv.VNF', 'properties': {'version': 1.0, 'vendor': 'acmetelco', 'id': 'vnf1'}}}, 'policies': [{'rule1': {'type': 'tosca.policies.Placement.Geolocation', 'targets': ['VNF1'], 'properties': {'region': ['us-west-1']}}}]}, 'metadata': {'template_name': 'TOSCA NFV Sample Template'}}}
+02/17/2017 03:28:07 PM Boundary VLs: {}
+02/17/2017 03:28:07 PM VL sites: {}
+02/17/2017 03:28:07 PM Push Response received from 12345678123456781234567812345678
+02/17/2017 03:28:07 PM Subscribers: ['12345678123456781234567812345678'] for TUID: 64bf4842181e45af8c125c5742a6d53a
+02/17/2017 03:28:09 PM Publish Request received from 9d2a14da97cb4d17b25a729266ea5789
+02/17/2017 03:28:09 PM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml
+02/17/2017 03:28:09 PM Node Labels: {'VNF2': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF3': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1', 'tosca.policies.Placement.Geolocation:properties:region:us-west-2']), 'VNF1': set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])}
+02/17/2017 03:28:09 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set(['12345678123456781234567812345678'])}
+02/17/2017 03:28:09 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': '12345678123456781234567812345678'}
+02/17/2017 03:28:09 PM Per domain file paths: {'12345678123456781234567812345678': './toscafiles/template_part12345678123456781234567812345678.yaml'}
+02/17/2017 03:28:09 PM Per domain topologies: {'12345678123456781234567812345678': {'policy_types': {'tosca.policies.Placement.Geolocation': {'description': 'Geolocation policy', 'derived_from': 'tosca.policies.Placement'}}, 'tosca_definitions_version': 'tosca_simple_profile_for_nfv_1_0_0', 'description': 'Template for deploying a single server with predefined properties.', 'topology_template': {'node_templates': {'VNF1': {'type': 'tosca.nodes.nfv.VNF', 'properties': {'version': 1.0, 'vendor': 'acmetelco', 'id': 'vnf1'}}}, 'policies': [{'rule1': {'type': 'tosca.policies.Placement.Geolocation', 'targets': ['VNF1'], 'properties': {'region': ['us-west-1']}}}]}, 'metadata': {'template_name': 'TOSCA NFV Sample Template'}}}
+02/17/2017 03:28:09 PM Boundary VLs: {}
+02/17/2017 03:28:09 PM VL sites: {}
+02/17/2017 03:28:09 PM TEMPLATE UUID 64bf4842181e45af8c125c5742a6d53a exists, verify publisher and update subscribers
+02/17/2017 03:28:09 PM Push Response received from 12345678123456781234567812345678
+02/17/2017 03:28:09 PM Subscribers: ['12345678123456781234567812345678'] for TUID: 64bf4842181e45af8c125c5742a6d53a

diff --git a/tests/refdata/test1_client1.ref b/tests/refdata/test1_client1.ref
index b1a0d49..13e7a4e 100644 (file)
--- a/tests/refdata/test1_client1.ref
+++ b/tests/refdata/test1_client1.ref
@@ -3,31 +3,24 @@ Domino Client Starting...
 Registration Response: Response Code: 1
 CLI Service is starting
 RPC service for CLI is starting...
-Received CLI ['heartbeat']
 12345678123456781234567812345678 Sending heartbeat
 heart beat received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 2
-Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1']
 subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot']
 Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 3
-Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE']
 subscribing labels [] and templates ['dummy1', 'dummy2']
 Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 4
-Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE']
 subscribing labels [] and templates ['dummy1', 'dummy2']
 Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 5
-Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2']
 subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates []
 Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 6
-Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE']
 subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
 Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 7
-Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE']
 subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
 Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 8
-Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml']
 Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml
 Publish Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 9 Status: 2
-Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1']
 subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates []
 Subscribe Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 10
 12345678123456781234567812345678 Received Template File
+12345678123456781234567812345678 Received Template File
+IGNORING error: ERRNO 17; ./toscafiles/12345678123456781234567812345678 exists.

diff --git a/tests/refdata/test1_client2.ref b/tests/refdata/test1_client2.ref
index b533bd3..7970af8 100644 (file)
--- a/tests/refdata/test1_client2.ref
+++ b/tests/refdata/test1_client2.ref
@@ -3,6 +3,9 @@ Domino Client Starting...
 Registration Response: Response Code: 1
 CLI Service is starting
 RPC service for CLI is starting...
-Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml']
 Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml
 Publish Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 11 Status: 1
+querying Domino Server: ['list-tuids']
+Query Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 13
+Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml
+Publish Response is received from: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ,sequence number: 14 Status: 1

diff --git a/tests/run.sh b/tests/run.sh
index d9dec64..8918ce5 100755 (executable)
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -141,6 +141,11 @@ python domino-cli.py $CLIENT1_CLIPORT subscribe \
         -l tosca.policies.Placement.Geolocation:properties:region:us-west-1
 sleep 1
 python domino-cli.py $CLIENT2_CLIPORT publish -t "$toscafile_test1"
+sleep 1
+TUID=$(python domino-cli.py $CLIENT2_CLIPORT list-tuids | cut -c3-34)
+echo $TUID
+sleep 1
+python domino-cli.py $CLIENT2_CLIPORT publish -t "$toscafile_test1" -k "$TUID"
 
 #echo "Stopping Domino Client 1..."
 #stop_client1