Fix Robot 1.3.2.1 .

Author: bluewings1211

example/Wordpress/forms.yaml

@@ -1,5 +1,5 @@
 create_site:
-  - parameter: instance_private_network
+  - parameter: private_network
     forms: ChoiceField
     label: Network
     # TODO We need to define general syntex on YAML for network
@@ -8,7 +8,7 @@ create_site:
       attrs:
         - class: form-control
         - required: required
-  - parameter: instance_image
+  - parameter: image
     forms: ChoiceField
     label: VM Image
     choices:
@@ -17,7 +17,7 @@ create_site:
       forms: Select
       attrs:
         - class: form-control
-  - parameter: instance_flavor
+  - parameter: flavor
     forms: ChoiceField
     label: Server Size
     choices:

example/Wordpress/site.yaml

@@ -5,40 +5,40 @@ parameters:
     type: number
   instance_site_name:
     type: string
-  instance_account:
+  account:
     type: string
   instance_number:
     type: number
     constraints:
       - range: {min: 1, max: 10}
-  instance_keypair:
+  keypair:
     type: string
     constraints:
       - custom_constraint: nova.keypair
-  instance_flavor:
+  flavor:
     type: string
     description:
       - allowed_values:
         - 1core2GBmemory20GBdisk
     constraints:
       - custom_constraint: nova.flavor
-  instance_image:
+  image:
     type: string
     description:
       - allowed_values:
         - Wordpress
     constraints:
       - custom_constraint: glance.image
-  instance_image_size:
+  image_size:
     type: number
     constraints:
       - range:
           min: 10
-  instance_public_network:
+  public_network:
     type: string
     constraints:
       - custom_constraint: neutron.network
-  instance_private_network:
+  private_network:
     type: string
     constraints:
       - custom_constraint: neutron.network
@@ -63,7 +63,7 @@ parameters:
   alarm_period:
     type: number
     default: 60
-  alarm_evaluation_periods:
+  evaluation_periods:
     type: number
     default: 1
   scale_max_size:
@@ -103,13 +103,13 @@ resources:
           my_site_name: {get_param: instance_site_name}
           my_site_id: {get_param: instance_site_id}
           my_index: '%index%'
-          my_account: {get_param: instance_account}
-          my_keypair: {get_param: instance_keypair}
-          my_flavor: {get_param: instance_flavor}
-          my_image: {get_param: instance_image}
-          my_image_size: {get_param: instance_image_size}
-          my_public_network: {get_param: instance_public_network}
-          my_private_network: {get_param: instance_private_network}
+          my_account: {get_param: account}
+          my_keypair: {get_param: keypair}
+          my_flavor: {get_param: flavor}
+          my_image: {get_param: image}
+          my_image_size: {get_param: image_size}
+          my_public_network: {get_param: public_network}
+          my_private_network: {get_param: private_network}
           my_security_group: {get_resource: instance_security_group}
           my_availability_zone: {get_param: availability_zone}
           metadata: {"metering.stack": {get_param: 'OS::stack_id'}}
@@ -127,13 +127,13 @@ resources:
           #TODO need to generate different index
           # or change the way of salt registration
           my_index: 65536
-          my_account: {get_param: instance_account}
-          my_keypair: {get_param: instance_keypair}
-          my_flavor: {get_param: instance_flavor}
-          my_image: {get_param: instance_image}
-          my_image_size: {get_param: instance_image_size}
-          my_public_network: {get_param: instance_public_network}
-          my_private_network: {get_param: instance_private_network}
+          my_account: {get_param: account}
+          my_keypair: {get_param: keypair}
+          my_flavor: {get_param: flavor}
+          my_image: {get_param: image}
+          my_image_size: {get_param: image_size}
+          my_public_network: {get_param: public_network}
+          my_private_network: {get_param: private_network}
           my_security_group: {get_resource: instance_security_group}
           my_availability_zone: {get_param: availability_zone}
           metadata: {"metering.stack": {get_param: 'OS::stack_id'}}
@@ -161,7 +161,7 @@ resources:
       meter_name: {get_param: meter_name}
       statistic: {get_param: alarm_statistic}
       period: {get_param: alarm_period}
-      evaluation_periods: {get_param: alarm_evaluation_periods}
+      evaluation_periods: {get_param: evaluation_periods}
       threshold: {get_param: scaleup_threshold}
       alarm_actions:
         - {get_attr: [scaleup_policy, alarm_url]}
@@ -175,7 +175,7 @@ resources:
       meter_name: {get_param: meter_name}
       statistic: {get_param: alarm_statistic}
       period: {get_param: alarm_period}
-      evaluation_periods: {get_param: alarm_evaluation_periods}
+      evaluation_periods: {get_param: evaluation_periods}
       threshold: {get_param: scaledown_threshold}
       alarm_actions:
         - {get_attr: [scaledown_policy, alarm_url]}