From 22bede4bc2dc4e3a7df92bc3be8e20dbde349f88 Mon Sep 17 00:00:00 2001 From: Ulas Kozat Date: Wed, 21 Sep 2016 10:11:15 -0700 Subject: Modify grammer in docs to force document creation Change-Id: Ic44f9ed7e17e0f2f775fa12c5f8108345268df12 Signed-off-by: Ulas Kozat (cherry picked from commit a442c7788064542fe14c2e2e5d802fe2e1b14512) --- .../installation.instructions.rst | 2 +- tests/logdata/client1.log | 66 ++++++++-------- tests/logdata/server.log | 90 +++++++++++----------- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/docs/installationprocedure/installation.instructions.rst b/docs/installationprocedure/installation.instructions.rst index 58f0000..790a5f0 100644 --- a/docs/installationprocedure/installation.instructions.rst +++ b/docs/installationprocedure/installation.instructions.rst @@ -50,7 +50,7 @@ You should see DominoClient.py, DominoServer.py, and domino-cli.py as executable Installation Steps (Multiple Node) ---------------------------------- -Repeat the installation steps for single node on each of the nodes. The script +Repeat the installation steps for single node on each node. The script run_multinode.sh under ./domino/tests directory deploys the Domino Code on three hosts from a deployment node and tests RPC calls. The private key location and remote host IP addresses must be manually entered and IS_IPandKEY_CONFIGURED=false diff --git a/tests/logdata/client1.log b/tests/logdata/client1.log index 9deb2ef..665a331 100644 --- a/tests/logdata/client1.log +++ b/tests/logdata/client1.log @@ -1,33 +1,33 @@ -07/21/2016 03:04:52 PM Domino Client Starting... -07/21/2016 03:04:52 PM 1 Sending Registration -07/21/2016 03:04:52 PM Registration Response: Response Code: 1 -07/21/2016 03:04:52 PM CLI Service is starting -07/21/2016 03:04:52 PM RPC service for CLI is starting... -07/21/2016 03:04:54 PM Received CLI ['heartbeat'] -07/21/2016 03:04:54 PM 12467 Sending heartbeat -07/21/2016 03:04:54 PM heart beat received from: 0 ,sequence number: 2 -07/21/2016 03:04:55 PM Received CLI ['subscribe', '-t', 'hot', '-l', 'tosca.policies.Placement:properties:region:nova-1'] -07/21/2016 03:04:55 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-1'] and templates ['hot'] -07/21/2016 03:04:55 PM Subscribe Response is received from: 0 ,sequence number: 3 -07/21/2016 03:04:56 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'OVERWRITE'] -07/21/2016 03:04:56 PM subscribing labels [] and templates ['dummy1', 'dummy2'] -07/21/2016 03:04:56 PM Subscribe Response is received from: 0 ,sequence number: 4 -07/21/2016 03:04:57 PM Received CLI ['subscribe', '-t', 'dummy1,dummy2', '--top', 'DELETE'] -07/21/2016 03:04:57 PM subscribing labels [] and templates ['dummy1', 'dummy2'] -07/21/2016 03:04:57 PM Subscribe Response is received from: 0 ,sequence number: 5 -07/21/2016 03:04:58 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-2'] -07/21/2016 03:04:58 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-2'] and templates [] -07/21/2016 03:04:58 PM Subscribe Response is received from: 0 ,sequence number: 6 -07/21/2016 03:04:59 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'OVERWRITE'] -07/21/2016 03:04:59 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] -07/21/2016 03:04:59 PM Subscribe Response is received from: 0 ,sequence number: 7 -07/21/2016 03:05:00 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement:properties:region:nova-3', '--lop', 'DELETE'] -07/21/2016 03:05:00 PM subscribing labels ['tosca.policies.Placement:properties:region:nova-3'] and templates [] -07/21/2016 03:05:00 PM Subscribe Response is received from: 0 ,sequence number: 8 -07/21/2016 03:05:01 PM Received CLI ['publish', '-t', './tosca-templates/tosca_helloworld_nfv.yaml'] -07/21/2016 03:05:01 PM Publishing the template file: ./tosca-templates/tosca_helloworld_nfv.yaml -07/21/2016 03:05:01 PM Publish Response is received from: 0 ,sequence number: 9 Op. Status: 2 -07/21/2016 03:05:02 PM Received CLI ['subscribe', '-l', 'tosca.policies.Placement.Geolocation:properties:region:us-west-1'] -07/21/2016 03:05:02 PM subscribing labels ['tosca.policies.Placement.Geolocation:properties:region:us-west-1'] and templates [] -07/21/2016 03:05:02 PM Subscribe Response is received from: 0 ,sequence number: 10 -07/21/2016 03:05:03 PM 12467 Received Template File +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 diff --git a/tests/logdata/server.log b/tests/logdata/server.log index 562696b..0be15dc 100644 --- a/tests/logdata/server.log +++ b/tests/logdata/server.log @@ -1,45 +1,45 @@ -07/21/2016 03:04:51 PM Domino Server Starting... -07/21/2016 03:04:52 PM Registration Request received for UDID 12467 from IP: 192.168.254.12 port: 9091 -07/21/2016 03:04:53 PM Registration Request received for UDID 12467 from IP: 192.168.254.12 port: 9092 -07/21/2016 03:04:54 PM heartbeat received from 12467 -07/21/2016 03:04:55 PM Subscribe Request received from 12467 -07/21/2016 03:04:55 PM APPENDING Labels... -07/21/2016 03:04:55 PM Supported Template: set(['hot']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -07/21/2016 03:04:56 PM Subscribe Request received from 12467 -07/21/2016 03:04:56 PM APPENDING Labels... -07/21/2016 03:04:56 PM Supported Template: set(['dummy2', 'dummy1']) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -07/21/2016 03:04:57 PM Subscribe Request received from 12467 -07/21/2016 03:04:57 PM APPENDING Labels... -07/21/2016 03:04:57 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-1']) -07/21/2016 03:04:58 PM Subscribe Request received from 12467 -07/21/2016 03:04:58 PM APPENDING Labels... -07/21/2016 03:04:58 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-2', 'tosca.policies.Placement:properties:region:nova-1']) -07/21/2016 03:04:59 PM Subscribe Request received from 12467 -07/21/2016 03:04:59 PM OVERWRITING Labels... -07/21/2016 03:04:59 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement:properties:region:nova-3']) -07/21/2016 03:05:00 PM Subscribe Request received from 12467 -07/21/2016 03:05:00 PM DELETING Labels... -07/21/2016 03:05:00 PM Supported Template: set([]) Supported Labels: set([]) -07/21/2016 03:05:01 PM Publish Request received from 12467 -07/21/2016 03:05:01 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/21/2016 03:05:01 PM nfv -07/21/2016 03:05:01 PM nfv.py -07/21/2016 03:05:01 PM The input "./toscafiles/template1.yaml" successfully passed validation. -07/21/2016 03:05:01 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/21/2016 03:05:01 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([])} -07/21/2016 03:05:01 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': []} -07/21/2016 03:05:01 PM Per domain file paths: {} -07/21/2016 03:05:02 PM Subscribe Request received from 12467 -07/21/2016 03:05:02 PM APPENDING Labels... -07/21/2016 03:05:02 PM Supported Template: set([]) Supported Labels: set(['tosca.policies.Placement.Geolocation:properties:region:us-west-1']) -07/21/2016 03:05:03 PM Publish Request received from 4877619612774783847 -07/21/2016 03:05:03 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/21/2016 03:05:03 PM ERRNO 17; ./toscafiles/ exists. Creating: ./toscafiles/template1.yaml -07/21/2016 03:05:03 PM nfv -07/21/2016 03:05:03 PM nfv.py -07/21/2016 03:05:03 PM The input "./toscafiles/template1.yaml" successfully passed validation. -07/21/2016 03:05:03 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/21/2016 03:05:03 PM Site Maps: {'VNF2': set([]), 'VNF3': set([]), 'VNF1': set([12467])} -07/21/2016 03:05:03 PM Selected Sites: {'VNF2': [], 'VNF3': [], 'VNF1': 12467} -07/21/2016 03:05:03 PM Per domain file paths: {12467: './toscafiles/template_part12467.yaml'} -07/21/2016 03:05:03 PM Push Response received from 12467 +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 -- cgit 1.2.3-korg