diff options
| -rwxr-xr-x | DominoClient.py | 2 | ||||
| -rw-r--r-- | lib/mapper/label.py | 2 | ||||
| -rw-r--r-- | tests/logdata/client1.log | 102 | ||||
| -rw-r--r-- | tests/logdata/server.log | 126 | ||||
| -rw-r--r-- | tests/refdata/test1_client1.ref | 2 | ||||
| -rw-r--r-- | tests/refdata/test1_client2.ref | 2 |
6 files changed, 76 insertions, 160 deletions
diff --git a/DominoClient.py b/DominoClient.py index 1a54648..0b2ddd3 100755 --- a/DominoClient.py +++ b/DominoClient.py @@ -339,7 +339,7 @@ class DominoClient: return try: pub_msg_r = self.sender().d_publish(pub_msg) - logging.info('Publish Response is received from: %d ,sequence number: %d Op. Status: %d', pub_msg_r.domino_udid, pub_msg_r.seq_no, pub_msg_r.responseCode) + logging.info('Publish Response is received from: %d ,sequence number: %d Status: %d', pub_msg_r.domino_udid, pub_msg_r.seq_no, pub_msg_r.responseCode) except (Thrift.TException, TSocket.TTransportException) as tx: print '%s' % (tx.message) except (socket.timeout) as tx: diff --git a/lib/mapper/label.py b/lib/mapper/label.py index 02e2a18..6baa3c0 100644 --- a/lib/mapper/label.py +++ b/lib/mapper/label.py @@ -82,5 +82,5 @@ def select_site( site_map ): maxval = 1 maxkey = site node_site[node] = maxkey - counter[node_site[node]] = counter[node_site[node]] + 1 + counter[node_site[node]] = counter[node_site[node]] + 1 return node_site diff --git a/tests/logdata/client1.log b/tests/logdata/client1.log index c2ebd4b..7587cd8 100644 --- a/tests/logdata/client1.log +++ b/tests/logdata/client1.log @@ -1,69 +1,33 @@ -<<<<<<< HEAD -09/21/2016 10:08:40 AM Domino Client Starting... -09/21/2016 10:08:40 AM 1 Sending Registration -09/21/2016 10:08:40 AM Registration Response: Response Code: 1 -09/21/2016 10:08:40 AM CLI Service is starting -09/21/2016 10:08:40 AM RPC service for CLI is starting... -09/21/2016 10:08:42 AM Received CLI ['heartbeat'] -09/21/2016 10:08:42 AM 12467 Sending heartbeat -09/21/2016 10:08:42 AM heart beat received from: 0 ,sequence number: 2 -09/21/2016 10:08:43 AM Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1'] -09/21/2016 10:08:43 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot'] -09/21/2016 10:08:43 AM Subscribe Response is received from: 0 ,sequence number: 3 -09/21/2016 10:08:44 AM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE'] -09/21/2016 10:08:44 AM subscribing labels [] and templates ['dummy1', 'dummy2'] -09/21/2016 10:08:44 AM Subscribe Response is received from: 0 ,sequence number: 4 -09/21/2016 10:08:45 AM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE'] -09/21/2016 10:08:45 AM subscribing labels [] and templates ['dummy1', 'dummy2'] -09/21/2016 10:08:45 AM Subscribe Response is received from: 0 ,sequence number: 5 -09/21/2016 10:08:46 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2'] -09/21/2016 10:08:46 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates [] -09/21/2016 10:08:46 AM Subscribe Response is received from: 0 ,sequence number: 6 -09/21/2016 10:08:47 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE'] -09/21/2016 10:08:47 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] -09/21/2016 10:08:47 AM Subscribe Response is received from: 0 ,sequence number: 7 -09/21/2016 10:08:48 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE'] -09/21/2016 10:08:48 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] -09/21/2016 10:08:48 AM Subscribe Response is received from: 0 ,sequence number: 8 -09/21/2016 10:08:49 AM Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml'] -09/21/2016 10:08:49 AM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml -09/21/2016 10:08:49 AM Publish Response is received from: 0 ,sequence number: 9 Op. Status: 2 -09/21/2016 10:08:50 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1'] -09/21/2016 10:08:50 AM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates [] -09/21/2016 10:08:50 AM Subscribe Response is received from: 0 ,sequence number: 10 -09/21/2016 10:08:51 AM 12467 Received Template File -======= -11/17/2016 10:51:34 AM Domino Client Starting... -11/17/2016 10:51:34 AM 1 Sending Registration -11/17/2016 10:51:34 AM Registration Response: Response Code: 1 -11/17/2016 10:51:34 AM CLI Service is starting -11/17/2016 10:51:34 AM RPC service for CLI is starting... -11/17/2016 10:51:36 AM Received CLI ['heartbeat'] -11/17/2016 10:51:36 AM 0 Sending heartbeat -11/17/2016 10:51:36 AM heart beat received from: 0 ,sequence number: 2 -11/17/2016 10:51:37 AM Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1'] -11/17/2016 10:51:37 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot'] -11/17/2016 10:51:37 AM Subscribe Response is received from: 0 ,sequence number: 3 -11/17/2016 10:51:38 AM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE'] -11/17/2016 10:51:38 AM subscribing labels [] and templates ['dummy1', 'dummy2'] -11/17/2016 10:51:38 AM Subscribe Response is received from: 0 ,sequence number: 4 -11/17/2016 10:51:39 AM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE'] -11/17/2016 10:51:39 AM subscribing labels [] and templates ['dummy1', 'dummy2'] -11/17/2016 10:51:39 AM Subscribe Response is received from: 0 ,sequence number: 5 -11/17/2016 10:51:40 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2'] -11/17/2016 10:51:40 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates [] -11/17/2016 10:51:40 AM Subscribe Response is received from: 0 ,sequence number: 6 -11/17/2016 10:51:41 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE'] -11/17/2016 10:51:41 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] -11/17/2016 10:51:41 AM Subscribe Response is received from: 0 ,sequence number: 7 -11/17/2016 10:51:42 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE'] -11/17/2016 10:51:42 AM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] -11/17/2016 10:51:42 AM Subscribe Response is received from: 0 ,sequence number: 8 -11/17/2016 10:51:43 AM Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml'] -11/17/2016 10:51:43 AM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml -11/17/2016 10:51:43 AM Publish Response is received from: 0 ,sequence number: 9 Op. Status: 2 -11/17/2016 10:51:44 AM Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1'] -11/17/2016 10:51:44 AM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates [] -11/17/2016 10:51:44 AM Subscribe Response is received from: 0 ,sequence number: 10 -11/17/2016 10:51:45 AM 0 Received Template File ->>>>>>> e746280... Replace toscaparser with native yaml to load published Tosca file into memory +11/18/2016 12:40:26 PM Domino Client Starting... +11/18/2016 12:40:26 PM 1 Sending Registration +11/18/2016 12:40:26 PM Registration Response: Response Code: 1 +11/18/2016 12:40:26 PM CLI Service is starting +11/18/2016 12:40:26 PM RPC service for CLI is starting... +11/18/2016 12:40:28 PM Received CLI ['heartbeat'] +11/18/2016 12:40:28 PM 0 Sending heartbeat +11/18/2016 12:40:28 PM heart beat received from: 0 ,sequence number: 2 +11/18/2016 12:40:29 PM Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1'] +11/18/2016 12:40:29 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot'] +11/18/2016 12:40:29 PM Subscribe Response is received from: 0 ,sequence number: 3 +11/18/2016 12:40:30 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE'] +11/18/2016 12:40:30 PM subscribing labels [] and templates ['dummy1', 'dummy2'] +11/18/2016 12:40:30 PM Subscribe Response is received from: 0 ,sequence number: 4 +11/18/2016 12:40:31 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE'] +11/18/2016 12:40:31 PM subscribing labels [] and templates ['dummy1', 'dummy2'] +11/18/2016 12:40:31 PM Subscribe Response is received from: 0 ,sequence number: 5 +11/18/2016 12:40:32 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2'] +11/18/2016 12:40:32 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates [] +11/18/2016 12:40:32 PM Subscribe Response is received from: 0 ,sequence number: 6 +11/18/2016 12:40:33 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE'] +11/18/2016 12:40:33 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] +11/18/2016 12:40:33 PM Subscribe Response is received from: 0 ,sequence number: 7 +11/18/2016 12:40:34 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE'] +11/18/2016 12:40:34 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] +11/18/2016 12:40:34 PM Subscribe Response is received from: 0 ,sequence number: 8 +11/18/2016 12:40:35 PM Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml'] +11/18/2016 12:40:35 PM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml +11/18/2016 12:40:35 PM Publish Response is received from: 0 ,sequence number: 9 Status: 2 +11/18/2016 12:40:36 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1'] +11/18/2016 12:40:36 PM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates [] +11/18/2016 12:40:36 PM Subscribe Response is received from: 0 ,sequence number: 10 +11/18/2016 12:40:37 PM 0 Received Template File diff --git a/tests/logdata/server.log b/tests/logdata/server.log index 9c60101..1a7dbde 100644 --- a/tests/logdata/server.log +++ b/tests/logdata/server.log @@ -1,87 +1,39 @@ -<<<<<<< HEAD -09/21/2016 10:08:39 AM Domino Server Starting... -09/21/2016 10:08:40 AM Registration Request received for UDID 12467 from IP: 192.168.252.174 port: 9091 -09/21/2016 10:08:41 AM Registration Request received for UDID 12467 from IP: 192.168.252.174 port: 9092 -09/21/2016 10:08:42 AM heartbeat received from 12467 -09/21/2016 10:08:43 AM Subscribe Request received from 12467 -09/21/2016 10:08:43 AM APPENDING Labels... -09/21/2016 10:08:43 AM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -09/21/2016 10:08:44 AM Subscribe Request received from 12467 -09/21/2016 10:08:44 AM APPENDING Labels... -09/21/2016 10:08:44 AM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -09/21/2016 10:08:45 AM Subscribe Request received from 12467 -09/21/2016 10:08:45 AM APPENDING Labels... -09/21/2016 10:08:45 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -09/21/2016 10:08:46 AM Subscribe Request received from 12467 -09/21/2016 10:08:46 AM APPENDING Labels... -09/21/2016 10:08:46 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1']) -09/21/2016 10:08:47 AM Subscribe Request received from 12467 -09/21/2016 10:08:47 AM OVERWRITING Labels... -09/21/2016 10:08:47 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3']) -09/21/2016 10:08:48 AM Subscribe Request received from 12467 -09/21/2016 10:08:48 AM DELETING Labels... -09/21/2016 10:08:48 AM Supported Template: set([]) Supported Labels: set([]) -09/21/2016 10:08:49 AM Publish Request received from 12467 -09/21/2016 10:08:49 AM ['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 ]'] -09/21/2016 10:08:49 AM nfv -09/21/2016 10:08:49 AM nfv.py -09/21/2016 10:08:49 AM The input "./toscafiles/template1.yaml" successfully passed validation. -09/21/2016 10:08:49 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'])} -09/21/2016 10:08:49 AM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])} -09/21/2016 10:08:49 AM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []} -09/21/2016 10:08:49 AM Per domain file paths: {} -09/21/2016 10:08:50 AM Subscribe Request received from 12467 -09/21/2016 10:08:50 AM APPENDING Labels... -09/21/2016 10:08:50 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1']) -09/21/2016 10:08:51 AM Publish Request received from 5132942229496730997 -09/21/2016 10:08:51 AM ['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 ]'] -09/21/2016 10:08:51 AM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml -09/21/2016 10:08:51 AM nfv -09/21/2016 10:08:51 AM nfv.py -09/21/2016 10:08:51 AM The input "./toscafiles/template1.yaml" successfully passed validation. -09/21/2016 10:08:51 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'])} -09/21/2016 10:08:51 AM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([12467])} -09/21/2016 10:08:51 AM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': 12467} -09/21/2016 10:08:51 AM Per domain file paths: {12467: './toscafiles/template_part12467.yaml'} -09/21/2016 10:08:51 AM Push Response received from 12467 -======= -11/17/2016 10:51:33 AM Domino Server Starting... -11/17/2016 10:51:34 AM Registration Request received for UDID 0 from IP: 192.168.255.160 port: 9091 -11/17/2016 10:51:35 AM Registration Request received for UDID 0 from IP: 192.168.255.160 port: 9092 -11/17/2016 10:51:36 AM heartbeat received from 0 -11/17/2016 10:51:37 AM Subscribe Request received from 0 -11/17/2016 10:51:37 AM APPENDING Labels... -11/17/2016 10:51:37 AM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -11/17/2016 10:51:38 AM Subscribe Request received from 0 -11/17/2016 10:51:38 AM APPENDING Labels... -11/17/2016 10:51:38 AM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -11/17/2016 10:51:39 AM Subscribe Request received from 0 -11/17/2016 10:51:39 AM APPENDING Labels... -11/17/2016 10:51:39 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -11/17/2016 10:51:40 AM Subscribe Request received from 0 -11/17/2016 10:51:40 AM APPENDING Labels... -11/17/2016 10:51:40 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1']) -11/17/2016 10:51:41 AM Subscribe Request received from 0 -11/17/2016 10:51:41 AM OVERWRITING Labels... -11/17/2016 10:51:41 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3']) -11/17/2016 10:51:42 AM Subscribe Request received from 0 -11/17/2016 10:51:42 AM DELETING Labels... -11/17/2016 10:51:42 AM Supported Template: set([]) Supported Labels: set([]) -11/17/2016 10:51:43 AM Publish Request received from 0 -11/17/2016 10:51:43 AM ['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 ]'] -11/17/2016 10:51:43 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'])} -11/17/2016 10:51:43 AM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])} -11/17/2016 10:51:43 AM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []} -11/17/2016 10:51:43 AM Per domain file paths: {} -11/17/2016 10:51:44 AM Subscribe Request received from 0 -11/17/2016 10:51:44 AM APPENDING Labels... -11/17/2016 10:51:44 AM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1']) -11/17/2016 10:51:45 AM Publish Request received from 7835465092099811082 -11/17/2016 10:51:45 AM ['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 ]'] -11/17/2016 10:51:45 AM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml -11/17/2016 10:51:45 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'])} -11/17/2016 10:51:45 AM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([0])} -11/17/2016 10:51:45 AM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': 0} -11/17/2016 10:51:45 AM Per domain file paths: {0: './toscafiles/template_part0.yaml'} -11/17/2016 10:51:45 AM Push Response received from 0 ->>>>>>> e746280... Replace toscaparser with native yaml to load published Tosca file into memory +11/18/2016 12:40:25 PM Domino Server Starting... +11/18/2016 12:40:26 PM Registration Request received for UDID 0 from IP: 172.16.42.3 port: 9091 +11/18/2016 12:40:27 PM Registration Request received for UDID 0 from IP: 172.16.42.3 port: 9092 +11/18/2016 12:40:28 PM heartbeat received from 0 +11/18/2016 12:40:29 PM Subscribe Request received from 0 +11/18/2016 12:40:29 PM APPENDING Labels... +11/18/2016 12:40:29 PM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) +11/18/2016 12:40:30 PM Subscribe Request received from 0 +11/18/2016 12:40:30 PM APPENDING Labels... +11/18/2016 12:40:30 PM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) +11/18/2016 12:40:31 PM Subscribe Request received from 0 +11/18/2016 12:40:31 PM APPENDING Labels... +11/18/2016 12:40:31 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) +11/18/2016 12:40:32 PM Subscribe Request received from 0 +11/18/2016 12:40:32 PM APPENDING Labels... +11/18/2016 12:40:32 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1']) +11/18/2016 12:40:33 PM Subscribe Request received from 0 +11/18/2016 12:40:33 PM OVERWRITING Labels... +11/18/2016 12:40:33 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3']) +11/18/2016 12:40:34 PM Subscribe Request received from 0 +11/18/2016 12:40:34 PM DELETING Labels... +11/18/2016 12:40:34 PM Supported Template: set([]) Supported Labels: set([]) +11/18/2016 12:40:35 PM Publish Request received from 0 +11/18/2016 12:40:35 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 ]'] +11/18/2016 12:40:35 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'])} +11/18/2016 12:40:35 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])} +11/18/2016 12:40:35 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []} +11/18/2016 12:40:35 PM Per domain file paths: {} +11/18/2016 12:40:36 PM Subscribe Request received from 0 +11/18/2016 12:40:36 PM APPENDING Labels... +11/18/2016 12:40:36 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1']) +11/18/2016 12:40:37 PM Publish Request received from 1539113194358776833 +11/18/2016 12:40:37 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 ]'] +11/18/2016 12:40:37 PM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml +11/18/2016 12:40:37 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'])} +11/18/2016 12:40:37 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([0])} +11/18/2016 12:40:37 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': 0} +11/18/2016 12:40:37 PM Per domain file paths: {0: './toscafiles/template_part0.yaml'} +11/18/2016 12:40:37 PM Push Response received from 0 diff --git a/tests/refdata/test1_client1.ref b/tests/refdata/test1_client1.ref index 6ede273..0d6714d 100644 --- a/tests/refdata/test1_client1.ref +++ b/tests/refdata/test1_client1.ref @@ -26,7 +26,7 @@ subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and tem Subscribe Response is received from: 0 ,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: 0 ,sequence number: 9 Op. Status: 2 +Publish Response is received from: 0 ,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: 0 ,sequence number: 10 diff --git a/tests/refdata/test1_client2.ref b/tests/refdata/test1_client2.ref index 29afa6b..7c4fd56 100644 --- a/tests/refdata/test1_client2.ref +++ b/tests/refdata/test1_client2.ref @@ -5,4 +5,4 @@ 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: 0 ,sequence number: 11 Op. Status: 1 +Publish Response is received from: 0 ,sequence number: 11 Status: 1 |