summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlas Kozat <ulas.kozat@gmail.com>2016-06-14 14:16:22 -0700
committerUlas Kozat <ulas.kozat@gmail.com>2016-06-14 14:16:22 -0700
commitd9a5837b612db8eb8405e80f591ba3416b16f96a (patch)
tree30a330806e0967bcb9b56d321a7a5907de7b971f
parent6f43d28863ec988db7870d86a918199fda64dd1f (diff)
updated documentation and included another sample Tosca file
Change-Id: Iedcd4838f907294909373aaac5de3a94ab9b8e06 Signed-off-by: Ulas Kozat <ulas.kozat@gmail.com>
-rw-r--r--docs/platformoverview/platformoverview.rst8
-rwxr-xr-xdocs/userguide/api-documentation.rst2
-rw-r--r--tosca-templates/test_tosca_nfv_sample.yaml72
3 files changed, 78 insertions, 4 deletions
diff --git a/docs/platformoverview/platformoverview.rst b/docs/platformoverview/platformoverview.rst
index 5c9d2cf..725755f 100644
--- a/docs/platformoverview/platformoverview.rst
+++ b/docs/platformoverview/platformoverview.rst
@@ -25,9 +25,11 @@ Components
Domino platform, as of Colorado release, consists of the following
components:
-* Domino Server
-* Domino Client
-* One or more OpenStack sites
+* One Domino Server
+* One or more Domino Clients
+* domino-cli.py application as command line interface
+* One or more OpenStack Sites with Heat
+
.. note::
Tosca Template files are sample for reference, does not correspond to any actual service or VNF.
diff --git a/docs/userguide/api-documentation.rst b/docs/userguide/api-documentation.rst
index 06e6f77..d18d697 100755
--- a/docs/userguide/api-documentation.rst
+++ b/docs/userguide/api-documentation.rst
@@ -30,6 +30,7 @@ Prerequisites:
./DominoClient.py -p <portnumber> --cliport <cli-portnumber> --log=debug
Note1: The default log level is WARNING and omitting --log option will lead to minimal/no logging on the console
+
Note2: domino_conf.py file includes most of the default values
* Registration Command
@@ -134,7 +135,6 @@ This message has the following fields that are automatically filled in.
Template Type (= TOSCA)
Template File
-Note: Current version of the code has a hardcoded CLI port number, so no two Domino Clients can be run in the same port name space.
Interactive CLI mode
====================
diff --git a/tosca-templates/test_tosca_nfv_sample.yaml b/tosca-templates/test_tosca_nfv_sample.yaml
new file mode 100644
index 0000000..ab9dd04
--- /dev/null
+++ b/tosca-templates/test_tosca_nfv_sample.yaml
@@ -0,0 +1,72 @@
+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:
+
+ VDU1:
+ type: tosca.nodes.nfv.VDU
+ capabilities:
+ host:
+ properties:
+ num_cpus: 2
+ disk_size: 10 GB
+ mem_size: 512 MB
+ # Guest Operating System properties
+ os:
+ properties:
+ # host Operating System image properties
+ architecture: x86_64
+ type: Linux
+ distribution: RHEL
+ version: 6.5
+ VDU2:
+ type: tosca.nodes.nfv.VDU
+ capabilities:
+ host:
+ properties:
+ num_cpus: 2
+ disk_size: 10 GB
+ mem_size: 512 MB
+ # Guest Operating System properties
+ os:
+ properties:
+ # host Operating System image properties
+ architecture: x86_64
+ type: Linux
+ distribution: RHEL
+ version: 6.5
+
+ CP1:
+ type: tosca.nodes.nfv.CP
+ properties:
+ ip_address: 192.168.0.55
+ requirements:
+ - virtualLink:
+ node: VL1
+# relationship: tosca.relationships.nfv.VirtualLinksTo
+ - virtualBinding:
+ node: VDU1
+ relationship: tosca.relationships.nfv.VirtualBindsTo
+
+ VL1:
+ type: tosca.nodes.nfv.VL
+ properties:
+ vendor: ACME
+ cidr: '192.168.0.0/24'
+ start_ip: '192.168.0.50'
+ end_ip: '192.168.0.200'
+ gateway_ip: '192.168.0.1'
+
+ policies:
+ - rule1:
+ type: tosca.policies.Placement
+ targets: [ VDU1, CP1, VL1 ]
+ properties:
+ region: [ nova-1 ]
+ - rule2:
+ type: tosca.policies.Placement
+ targets: [ VDU2 ]
+ properties:
+ region: [ nova-2 ]