Merge "Create translation test code for vRNC" into stable/colorado

2 files changed, 43 insertions, 39 deletions

diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml
index 8c98fc9..62ed2ad 100644
--- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/rnc_definition.yaml
@@ -14,7 +14,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 #metadata:
 #  template_name: tosca_simple_profile_for_nfv_vRNC
-#  template_author: opnfv_parser_project_from_zte
+#  template_author: opnfv_parser_project
 #  template_version: tosca_simple_profile_for_nfv_1_0
 
 # Optional description of the definitions inside the file.
diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
index a134e3c..15ca91b 100644
--- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
@@ -14,7 +14,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: tosca_simple_profile_for_nfv_vRNC
-  template_author: opnfv_parser_project_from_zte
+  template_author: opnfv_parser_project
   template_version: tosca_simple_profile_for_nfv_1_0
 
 # Optional description of the definitions inside the file.
@@ -40,23 +40,23 @@ dsl_definitions:
 
   compute_props_host_MM: &compute_props_host_MM
     disk_size: 1 GB
-    num_cpus: 2
-    mem_size: 64 MB
+    num_cpus: 1
+    mem_size: 512 MB
 
   compute_props_host_CM: &compute_props_host_CM
     disk_size: 0 GB
-    num_cpus: 2
-    mem_size: 64 MB
+    num_cpus: 1
+    mem_size: 512 MB
 
   compute_props_host_DM: &compute_props_host_DM
     disk_size: 0 GB
-    num_cpus: 2
-    mem_size: 64 MB
+    num_cpus: 1
+    mem_size: 512 MB
 
   compute_props_host_LB: &compute_props_host_LB
     disk_size: 0 GB
-    num_cpus: 2
-    mem_size: 64 MB
+    num_cpus: 1
+    mem_size: 512 MB
 
 # topology template definition of the cloud application or service
 topology_template:
@@ -78,7 +78,7 @@ topology_template:
     vendor:
       type: string
       description: name of the vendor who generate this VNF
-      default: ZTE
+      default: opnfv_parser_project
     version:
       type: version
       description: version of the software for this VNF
@@ -102,9 +102,9 @@ topology_template:
       interfaces:
         Standard:
           create:
-            implementation: mm_install.sh
+            implementation: ./Scripts/MM/mm_install.sh
           configure:
-            implementation: mm_active_configure.sh
+            implementation: ./Scripts/MM/mm_active_configure.sh
 
     MM_Active_Host:
       type: rnc.nodes.compute.MM
@@ -133,9 +133,9 @@ topology_template:
       interfaces:
         Standard:
           create:
-            implementation: mm_install.sh
+            implementation: ./Scripts/MM/mm_install.sh
           configure:
-            implementation: mm_passvie_configure.sh
+            implementation: ./Scripts/MM/mm_passvie_configure.sh
 
     MM_Passive_Host:
       type: rnc.nodes.compute.MM
@@ -151,11 +151,20 @@ topology_template:
         - local_storage:
             node: MM_BlockStorage
             relationship: Storage_attachesto
-        - high_availability: MM_Active
+        - high_availability: MM_Active_Host
       artifacts:
         #the VM image of MM
         vm_image: mm.image
 
+    MM_BlockStorage:
+      type: rnc.nodes.BlockStorage
+      properties:
+        size: { get_input: mm_storage_size }
+      interfaces:
+        Configure:
+          post_configure_target:
+            implementation: ./Scripts/MM/storage_script.sh
+
     CM_Active:
       type: tosca.nodes.SoftwareComponent
       properties:
@@ -165,9 +174,9 @@ topology_template:
       interfaces:
         Standard:
           create:
-            implementation: cm_install.sh
+            implementation: ./Scripts/CM/cm_install.sh
           configure:
-            implementation: cm_active_configure.sh
+            implementation: ./Scripts/CM/cm_active_configure.sh
 
     CM_Active_Host:
       type: rnc.nodes.compute.CM
@@ -196,9 +205,9 @@ topology_template:
       interfaces:
         Standard:
           create:
-            implementation: cm_install.sh
+            implementation: ./Scripts/CM/cm_install.sh
           configure:
-            implementation: cm_passvie_configure.sh
+            implementation: ./Scripts/CM/cm_passvie_configure.sh
 
     CM_Passive_Host:
       type: rnc.nodes.compute.CM
@@ -215,7 +224,7 @@ topology_template:
             max_instances: 12
             default_instances: 1
       requirements:
-        - high_availability: CM_Active
+        - high_availability: CM_Active_Host
       artifacts:
         #the VM image of CM
         vm_image: mm.image
@@ -229,9 +238,9 @@ topology_template:
       interfaces:
         Standard:
           create:
-            implementation: dm_install.sh
+            implementation: ./Scripts/DM/dm_install.sh
           configure:
-            implementation: dm_configure.sh
+            implementation: ./Scripts/DM/dm_configure.sh
 
     DM_Host:
       type: rnc.nodes.compute.DM
@@ -257,9 +266,9 @@ topology_template:
       interfaces:
         Standard:
           create:
-            implementation: lb_install.sh
+            implementation: ./Scripts/LB/lb_install.sh
           configure:
-            implementation: lb_configure.sh
+            implementation: ./Scripts/LB/lb_configure.sh
 
     LB_Host:
       type: rnc.nodes.compute.LB
@@ -277,15 +286,6 @@ topology_template:
         #the VM image of LB
         vm_image: lb.image
 
-    MM_BlockStorage:
-      type: rnc.nodes.BlockStorage
-      properties:
-        size: { get_input: mm_storage_size }
-      interfaces:
-        Configure:
-          post_configure_target:
-            implementation: default_script.sh
-
     CTRL_Net:
       type: rnc.nodes.VL
       properties:
@@ -386,7 +386,7 @@ topology_template:
         is_default: true
       requirements:
         - virtualBinding: MM_Passive_Host
-        - virtualLink: EMS_Net
+        - virtualLink: EXTERMEDIA_Net
 
     MM_Passive_Port_CTRL:
       type: rnc.nodes.CP.MM
@@ -404,7 +404,7 @@ topology_template:
         is_default: false
       requirements:
         - virtualBinding: MM_Passive_Host
-        - virtualLink: EXTERMEDIA_Net
+        - virtualLink: INTERMEDIA_Net
 
     CM_Active_Port_CTRL:
       type: rnc.nodes.CP.CM
@@ -515,7 +515,7 @@ topology_template:
   # definition of logical groups of node templates within the topology
   # To be continue about this section
   groups:
-    AnitAffinityServerGroup:
+    AntiAffinityServerGroup:
       type: tosca.groups.Root
       description: >
          Logical component grouping for anti affinity placement,
@@ -531,13 +531,17 @@ topology_template:
       members: [ CM_Active, DM ]
 
   policies:
-    - AnitAffinityPolicy:
+    - AntiAffinityPolicy:
+        # type: tosca.policies.Placement
         type: tosca.policies.Placement.Antilocate
+        # Current only placement in openstack community
         description: Apply anti-locate placement policy to group
-        targets: [ AnitAffinityServerGroup ]
+        targets: [ AntiAffinityServerGroup ]
 
     - AffinityPolicy:
+        #type: tosca.policies.Placement
         type: tosca.policies.Placement.Colocate
+        # Current only placement in openstack community
         description: Apply anti-locate placement policy to group
         targets: [ AffinityServerGroup ]