Improve ansible code for network xml creation

JIRA: YARDSTICK-1018

Change-Id: Ia94fb1ceb9cb55bd54e512f356f85a263c32d1cf
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>

1 files changed, 7 insertions, 42 deletions

diff --git a/ansible/roles/infra_create_network/tasks/create_xml.yml b/ansible/roles/infra_create_network/tasks/create_xml.yml
index 1632e591c..345b77927 100644
--- a/ansible/roles/infra_create_network/tasks/create_xml.yml
+++ b/ansible/roles/infra_create_network/tasks/create_xml.yml
@@ -42,8 +42,13 @@
       - name: "{{ item.name }}"
       - forward:
           mode: nat
-      - bridge
-      - ip
+      - bridge:
+          name: "{{ item.name }}"
+          stp: "on"
+          delay: "0"
+      - ip:
+          address: "{{ item.host_ip }}"
+          netmask: "{{ item.netmask }}"
     pretty_print: yes
 
 - name: Add new children nodes to "forward" node
@@ -64,46 +69,6 @@
           end: "65535"
     pretty_print: yes
 
-- name: Add "name" attribute to "bridge" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/bridge
-    attribute: name
-    value: "{{ item.name }}"
-    pretty_print: yes
-
-- name: Add "stp" attribute to "bridge" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/bridge
-    attribute: stp
-    value: "on"
-    pretty_print: yes
-
-- name: Add "delay" attribute to "bridge" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/bridge
-    attribute: delay
-    value: "0"
-    pretty_print: yes
-
-- name: Add "address" attribute to "ip" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/ip
-    attribute: address
-    value: "{{ item.host_ip }}"
-    pretty_print: yes
-
-- name: Add "netmask" attribute to "ip" node
-  xml:
-    path: "{{ xml_file }}"
-    xpath: /network/ip
-    attribute: netmask
-    value: "{{ item.netmask }}"
-    pretty_print: yes
-
 - name: Define the networks
   virt_net:
     command: define