From 663cc95a545bf90926199b7e3ec14eef41e0d670 Mon Sep 17 00:00:00 2001
From: chenhb-zte <chen.haibing1@zte.com.cn>
Date: Tue, 24 May 2016 09:50:34 -0400
Subject: [PATCH] Add boot_and_delete_server samples and functional test

Add the argument "auto_assign_nic: true" in boot_and_delete_server
functional test, and add a related sample.

Change-Id: I7e596c29ae5e9d9c6e7db4572b5e80a60f0dd0bb
---
 rally-jobs/nova.yaml                          |  1 +
 .../tasks/scenarios/nova/boot-and-delete.json | 26 +++++++++++++++++++
 .../tasks/scenarios/nova/boot-and-delete.yaml | 19 ++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/rally-jobs/nova.yaml b/rally-jobs/nova.yaml
index a961124d..36ed7feb 100644
--- a/rally-jobs/nova.yaml
+++ b/rally-jobs/nova.yaml
@@ -75,6 +75,7 @@
             name: {{flavor_name}}
         image:
             name: {{image_name}}
+        auto_assign_nic: true
       runner:
         type: "constant"
         times: 2
diff --git a/samples/tasks/scenarios/nova/boot-and-delete.json b/samples/tasks/scenarios/nova/boot-and-delete.json
index 82282eb2..9170e7de 100644
--- a/samples/tasks/scenarios/nova/boot-and-delete.json
+++ b/samples/tasks/scenarios/nova/boot-and-delete.json
@@ -22,6 +22,32 @@
                     "users_per_tenant": 2
                 }
             }
+        },
+        {
+            "args": {
+                "flavor": {
+                    "name": "{{flavor_name}}"
+                },
+                "image": {
+                    "name": "^cirros.*uec$"
+                },
+                "auto_assign_nic": true
+            },
+            "runner": {
+                "type": "constant",
+                "times": 10,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 3,
+                    "users_per_tenant": 2
+                },
+                "network": {
+                    "start_cidr": "10.2.0.0/24",
+                    "networks_per_tenant": 2
+                }
+            }
         }
     ]
 }
diff --git a/samples/tasks/scenarios/nova/boot-and-delete.yaml b/samples/tasks/scenarios/nova/boot-and-delete.yaml
index 08a3c94e..f9130de6 100644
--- a/samples/tasks/scenarios/nova/boot-and-delete.yaml
+++ b/samples/tasks/scenarios/nova/boot-and-delete.yaml
@@ -16,3 +16,22 @@
         users:
           tenants: 3
           users_per_tenant: 2
+
+    -
+      args:
+        flavor:
+            name: "{{flavor_name}}"
+        image:
+            name: "^cirros.*uec$"
+        auto_assign_nic: true
+      runner:
+        type: "constant"
+        times: 10
+        concurrency: 2
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 2
+        network:
+          start_cidr: "10.2.0.0/24"
+          networks_per_tenant: 2