Restore accidentally deleted line

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

3 files changed, 85 insertions, 85 deletions

diff --git a/tests/logdata/client1.log b/tests/logdata/client1.log
index 0376a0a..a696ed1 100644
--- a/tests/logdata/client1.log
+++ b/tests/logdata/client1.log
@@ -1,33 +1,33 @@
-07/08/2016 02:42:47 PM Domino Client Starting...
-07/08/2016 02:42:47 PM 1 Sending Registration
-07/08/2016 02:42:47 PM Registration Response: Response Code: 1
-07/08/2016 02:42:47 PM CLI Service is starting
-07/08/2016 02:42:47 PM RPC service for CLI is starting...
-07/08/2016 02:42:49 PM Received CLI ['heartbeat']
-07/08/2016 02:42:49 PM 12467 Sending heartbeat
-07/08/2016 02:42:49 PM heart beat received from: 0 ,sequence number: 2
-07/08/2016 02:42:50 PM Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1']
-07/08/2016 02:42:50 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot']
-07/08/2016 02:42:50 PM Subscribe Response is received from: 0 ,sequence number: 3
-07/08/2016 02:42:51 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE']
-07/08/2016 02:42:51 PM subscribing labels [] and templates ['dummy1', 'dummy2']
-07/08/2016 02:42:51 PM Subscribe Response is received from: 0 ,sequence number: 4
-07/08/2016 02:42:52 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE']
-07/08/2016 02:42:52 PM subscribing labels [] and templates ['dummy1', 'dummy2']
-07/08/2016 02:42:52 PM Subscribe Response is received from: 0 ,sequence number: 5
-07/08/2016 02:42:54 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2']
-07/08/2016 02:42:54 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates []
-07/08/2016 02:42:54 PM Subscribe Response is received from: 0 ,sequence number: 6
-07/08/2016 02:42:55 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE']
-07/08/2016 02:42:55 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
-07/08/2016 02:42:55 PM Subscribe Response is received from: 0 ,sequence number: 7
-07/08/2016 02:42:56 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE']
-07/08/2016 02:42:56 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
-07/08/2016 02:42:56 PM Subscribe Response is received from: 0 ,sequence number: 8
-07/08/2016 02:42:57 PM Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml']
-07/08/2016 02:42:57 PM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml
-07/08/2016 02:42:57 PM Publish Response is received from: 0 ,sequence number: 9 Op. Status: 2
-07/08/2016 02:42:58 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1']
-07/08/2016 02:42:58 PM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates []
-07/08/2016 02:42:58 PM Subscribe Response is received from: 0 ,sequence number: 10
-07/08/2016 02:42:59 PM 12467 Received Template File
+07/08/2016 02:50:33 PM Domino Client Starting...
+07/08/2016 02:50:33 PM 1 Sending Registration
+07/08/2016 02:50:33 PM Registration Response: Response Code: 1
+07/08/2016 02:50:33 PM CLI Service is starting
+07/08/2016 02:50:33 PM RPC service for CLI is starting...
+07/08/2016 02:50:35 PM Received CLI ['heartbeat']
+07/08/2016 02:50:35 PM 12467 Sending heartbeat
+07/08/2016 02:50:35 PM heart beat received from: 0 ,sequence number: 2
+07/08/2016 02:50:36 PM Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1']
+07/08/2016 02:50:36 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot']
+07/08/2016 02:50:36 PM Subscribe Response is received from: 0 ,sequence number: 3
+07/08/2016 02:50:37 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE']
+07/08/2016 02:50:37 PM subscribing labels [] and templates ['dummy1', 'dummy2']
+07/08/2016 02:50:37 PM Subscribe Response is received from: 0 ,sequence number: 4
+07/08/2016 02:50:38 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE']
+07/08/2016 02:50:38 PM subscribing labels [] and templates ['dummy1', 'dummy2']
+07/08/2016 02:50:38 PM Subscribe Response is received from: 0 ,sequence number: 5
+07/08/2016 02:50:39 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2']
+07/08/2016 02:50:39 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates []
+07/08/2016 02:50:39 PM Subscribe Response is received from: 0 ,sequence number: 6
+07/08/2016 02:50:40 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE']
+07/08/2016 02:50:40 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
+07/08/2016 02:50:40 PM Subscribe Response is received from: 0 ,sequence number: 7
+07/08/2016 02:50:41 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE']
+07/08/2016 02:50:41 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates []
+07/08/2016 02:50:41 PM Subscribe Response is received from: 0 ,sequence number: 8
+07/08/2016 02:50:43 PM Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml']
+07/08/2016 02:50:43 PM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml
+07/08/2016 02:50:43 PM Publish Response is received from: 0 ,sequence number: 9 Op. Status: 2
+07/08/2016 02:50:44 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1']
+07/08/2016 02:50:44 PM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates []
+07/08/2016 02:50:44 PM Subscribe Response is received from: 0 ,sequence number: 10
+07/08/2016 02:50:45 PM 12467 Received Template File
diff --git a/tests/logdata/server.log b/tests/logdata/server.log
index 3a2682a..cd73717 100644
--- a/tests/logdata/server.log
+++ b/tests/logdata/server.log
@@ -1,45 +1,45 @@
-07/08/2016 02:42:47 PM Domino Server Starting...
-07/08/2016 02:42:47 PM Registration Request received for UDID 12467 from IP: 192.168.254.12 port: 9091
-07/08/2016 02:42:48 PM Registration Request received for UDID 12467 from IP: 192.168.254.12 port: 9092
-07/08/2016 02:42:49 PM heartbeat received from 12467
-07/08/2016 02:42:50 PM Subscribe Request received from 12467
-07/08/2016 02:42:50 PM APPENDING Labels...
-07/08/2016 02:42:50 PM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
-07/08/2016 02:42:51 PM Subscribe Request received from 12467
-07/08/2016 02:42:51 PM APPENDING Labels...
-07/08/2016 02:42:51 PM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
-07/08/2016 02:42:52 PM Subscribe Request received from 12467
-07/08/2016 02:42:52 PM APPENDING Labels...
-07/08/2016 02:42:52 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
-07/08/2016 02:42:54 PM Subscribe Request received from 12467
-07/08/2016 02:42:54 PM APPENDING Labels...
-07/08/2016 02:42:54 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1'])
-07/08/2016 02:42:55 PM Subscribe Request received from 12467
-07/08/2016 02:42:55 PM OVERWRITING Labels...
-07/08/2016 02:42:55 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3'])
-07/08/2016 02:42:56 PM Subscribe Request received from 12467
-07/08/2016 02:42:56 PM DELETING Labels...
-07/08/2016 02:42:56 PM Supported Template: set([]) Supported Labels: set([])
-07/08/2016 02:42:57 PM Publish Request received from 12467
-07/08/2016 02:42:57 PM ['tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0', '', 'description: Template for deploying a single server with predefined properties.', '', 'metadata:', '  template_name: TOSCA NFV Sample Template', '', 'policy_types:', '  tosca.policies.Placement.Geolocation:', '    description: Geolocation policy', '    derived_from: tosca.policies.Placement', '', 'topology_template:', '  node_templates:', '    VNF1:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf1', '        vendor: acmetelco', '        version: 1.0', '', '    VNF2:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf2', '        vendor: ericsson', '        version: 1.0', '', '    VNF3:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf3', '        vendor: huawei', '        version: 1.0', '', '  policies:', '    - rule1:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF1 ]', '        properties:', '          region: [ us-west-1 ]', '    - rule2:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF2, VNF3 ]', '        properties:', '          region: [ us-west-1 , us-west-2 ]']
-07/08/2016 02:42:57 PM nfv
-07/08/2016 02:42:57 PM nfv.py
-07/08/2016 02:42:57 PM The input "./toscafiles/template1.yaml" successfully passed validation.
-07/08/2016 02:42:57 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'])}
-07/08/2016 02:42:57 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])}
-07/08/2016 02:42:57 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []}
-07/08/2016 02:42:57 PM Per domain file paths: {}
-07/08/2016 02:42:58 PM Subscribe Request received from 12467
-07/08/2016 02:42:58 PM APPENDING Labels...
-07/08/2016 02:42:58 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])
-07/08/2016 02:42:59 PM Publish Request received from 4687831278552772781
-07/08/2016 02:42:59 PM ['tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0', '', 'description: Template for deploying a single server with predefined properties.', '', 'metadata:', '  template_name: TOSCA NFV Sample Template', '', 'policy_types:', '  tosca.policies.Placement.Geolocation:', '    description: Geolocation policy', '    derived_from: tosca.policies.Placement', '', 'topology_template:', '  node_templates:', '    VNF1:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf1', '        vendor: acmetelco', '        version: 1.0', '', '    VNF2:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf2', '        vendor: ericsson', '        version: 1.0', '', '    VNF3:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf3', '        vendor: huawei', '        version: 1.0', '', '  policies:', '    - rule1:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF1 ]', '        properties:', '          region: [ us-west-1 ]', '    - rule2:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF2, VNF3 ]', '        properties:', '          region: [ us-west-1 , us-west-2 ]']
-07/08/2016 02:42:59 PM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml
-07/08/2016 02:42:59 PM nfv
-07/08/2016 02:42:59 PM nfv.py
-07/08/2016 02:42:59 PM The input "./toscafiles/template1.yaml" successfully passed validation.
-07/08/2016 02:42:59 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'])}
-07/08/2016 02:42:59 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([12467])}
-07/08/2016 02:42:59 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': 12467}
-07/08/2016 02:42:59 PM Per domain file paths: {12467: './toscafiles/template_part12467.yaml'}
-07/08/2016 02:42:59 PM Push Response received from 12467
+07/08/2016 02:50:32 PM Domino Server Starting...
+07/08/2016 02:50:33 PM Registration Request received for UDID 12467 from IP: 192.168.254.12 port: 9091
+07/08/2016 02:50:34 PM Registration Request received for UDID 12467 from IP: 192.168.254.12 port: 9092
+07/08/2016 02:50:35 PM heartbeat received from 12467
+07/08/2016 02:50:36 PM Subscribe Request received from 12467
+07/08/2016 02:50:36 PM APPENDING Labels...
+07/08/2016 02:50:36 PM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
+07/08/2016 02:50:37 PM Subscribe Request received from 12467
+07/08/2016 02:50:37 PM APPENDING Labels...
+07/08/2016 02:50:37 PM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
+07/08/2016 02:50:38 PM Subscribe Request received from 12467
+07/08/2016 02:50:38 PM APPENDING Labels...
+07/08/2016 02:50:38 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1'])
+07/08/2016 02:50:39 PM Subscribe Request received from 12467
+07/08/2016 02:50:39 PM APPENDING Labels...
+07/08/2016 02:50:39 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1'])
+07/08/2016 02:50:40 PM Subscribe Request received from 12467
+07/08/2016 02:50:40 PM OVERWRITING Labels...
+07/08/2016 02:50:40 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3'])
+07/08/2016 02:50:41 PM Subscribe Request received from 12467
+07/08/2016 02:50:41 PM DELETING Labels...
+07/08/2016 02:50:41 PM Supported Template: set([]) Supported Labels: set([])
+07/08/2016 02:50:43 PM Publish Request received from 12467
+07/08/2016 02:50:43 PM ['tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0', '', 'description: Template for deploying a single server with predefined properties.', '', 'metadata:', '  template_name: TOSCA NFV Sample Template', '', 'policy_types:', '  tosca.policies.Placement.Geolocation:', '    description: Geolocation policy', '    derived_from: tosca.policies.Placement', '', 'topology_template:', '  node_templates:', '    VNF1:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf1', '        vendor: acmetelco', '        version: 1.0', '', '    VNF2:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf2', '        vendor: ericsson', '        version: 1.0', '', '    VNF3:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf3', '        vendor: huawei', '        version: 1.0', '', '  policies:', '    - rule1:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF1 ]', '        properties:', '          region: [ us-west-1 ]', '    - rule2:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF2, VNF3 ]', '        properties:', '          region: [ us-west-1 , us-west-2 ]']
+07/08/2016 02:50:43 PM nfv
+07/08/2016 02:50:43 PM nfv.py
+07/08/2016 02:50:43 PM The input "./toscafiles/template1.yaml" successfully passed validation.
+07/08/2016 02:50:43 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'])}
+07/08/2016 02:50:43 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])}
+07/08/2016 02:50:43 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []}
+07/08/2016 02:50:43 PM Per domain file paths: {}
+07/08/2016 02:50:44 PM Subscribe Request received from 12467
+07/08/2016 02:50:44 PM APPENDING Labels...
+07/08/2016 02:50:44 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1'])
+07/08/2016 02:50:45 PM Publish Request received from 1838360232553687883
+07/08/2016 02:50:45 PM ['tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0', '', 'description: Template for deploying a single server with predefined properties.', '', 'metadata:', '  template_name: TOSCA NFV Sample Template', '', 'policy_types:', '  tosca.policies.Placement.Geolocation:', '    description: Geolocation policy', '    derived_from: tosca.policies.Placement', '', 'topology_template:', '  node_templates:', '    VNF1:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf1', '        vendor: acmetelco', '        version: 1.0', '', '    VNF2:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf2', '        vendor: ericsson', '        version: 1.0', '', '    VNF3:', '      type: tosca.nodes.nfv.VNF', '      properties:', '        id: vnf3', '        vendor: huawei', '        version: 1.0', '', '  policies:', '    - rule1:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF1 ]', '        properties:', '          region: [ us-west-1 ]', '    - rule2:', '        type: tosca.policies.Placement.Geolocation', '        targets: [ VNF2, VNF3 ]', '        properties:', '          region: [ us-west-1 , us-west-2 ]']
+07/08/2016 02:50:45 PM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml
+07/08/2016 02:50:45 PM nfv
+07/08/2016 02:50:45 PM nfv.py
+07/08/2016 02:50:45 PM The input "./toscafiles/template1.yaml" successfully passed validation.
+07/08/2016 02:50:45 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'])}
+07/08/2016 02:50:45 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([12467])}
+07/08/2016 02:50:45 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': 12467}
+07/08/2016 02:50:45 PM Per domain file paths: {12467: './toscafiles/template_part12467.yaml'}
+07/08/2016 02:50:45 PM Push Response received from 12467
diff --git a/tests/run.sh b/tests/run.sh
index 54d47b7..d9dec64 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -20,9 +20,9 @@ LOGLEVEL=DEBUG
 toscafile_test1=./tosca-templates/tosca_helloworld_nfv.yaml
 test1_reffile1=./tests/refdata/test1_client1.ref
 test1_reffile2=./tests/refdata/test1_client2.ref
-test1_reffile3=./tests/refdata/test1_server.ref
 client1_log=./tests/logdata/client1.log
 client2_log=./tests/logdata/client2.log
+server_log=./tests/logdata/server.log
 
 start_server() {
   pgrep -f "python DominoServer.py" && return 0  
@@ -73,13 +73,13 @@ cleanup() {
   echo "Stopping Domino Server..."
   stop_server
 
-#  if [ -f file1 ]; then
-#    rm file1
-#  fi
+  if [ -f file1 ]; then
+    rm file1
+  fi
 
-#  if [ -f file2 ]; then
-#    rm file2
-#  fi
+  if [ -f file2 ]; then
+    rm file2
+  fi
 }
 
 echo "domino/tests/run.sh has been executed."