From: Julien <zhang.jun3g@zte.com.cn>
Date: Thu, 8 Dec 2016 02:50:42 +0000 (+0800)
Subject: fix yml define and wrong implementation
X-Git-Tag: 1.0.0~80^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F25649%2F1;p=daisy.git

fix yml define and wrong implementation

1. use list to define interfaces
2. no necessary to fetch [0]

Change-Id: If17605b27c00d4e7fca8bced9c0bb4f7c724a4f2
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
---

diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml
index 5390ecf9..0cb8f62b 100644
--- a/deploy/config/vm_environment/zte-virtual1/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml
@@ -1,20 +1,20 @@
 hosts:
 - name: 'Node5'
   roles:
-  - 'CONTROLLER_LB'
-  - 'COMPUTER'
+    - 'CONTROLLER_LB'
+    - 'COMPUTER'
   ip: '192.168.122.152'
   password: 'ossdbg1'
   interface:
-  - 'ens3':
-    - name: 'MANAGEMENT'
-      ip: '192.168.122.152'
-    - name: 'PUBLICAPI'
-      ip:
-    - name: 'physnet1'
-      ip:
-    - name: 'STORAGE'
-      ip:
-    'ens8':
-    - name: 'EXTERNAL'
-      ip:
+    - 'ens3':
+      - name: 'MANAGEMENT'
+        ip: '192.168.122.152'
+      - name: 'PUBLICAPI'
+        ip:
+      - name: 'physnet1'
+        ip:
+      - name: 'STORAGE'
+        ip:
+    - 'ens8':
+      - name: 'EXTERNAL'
+        ip:
diff --git a/deploy/config/vm_environment/zte-virtual1/network.yml b/deploy/config/vm_environment/zte-virtual1/network.yml
index 50fca1be..ea08117d 100644
--- a/deploy/config/vm_environment/zte-virtual1/network.yml
+++ b/deploy/config/vm_environment/zte-virtual1/network.yml
@@ -14,36 +14,36 @@ network-config-metadata:
   created: 'Mon Oct 31 2016'
   comment:
 networks:
-- cidr: '192.168.122.0/24'
-  gateway: '192.168.122.1'
-  ip_ranges:
-  - 'start': '192.168.122.1'
-    'end': '192.168.122.254'
-  name: 'MANAGEMENT'
-- cidr: '192.168.122.0/24'
-  gateway: '192.168.122.1'
-  ip_ranges:
-  - start: '192.168.122.1'
-    end: '192.168.122.254'
-  name: 'STORAGE'
-- cidr: '192.168.2.0/24'
-  gateway: '192.168.2.1'
-  ip_ranges:
-  - 'start': '192.168.2.1'
-    'end': '192.168.2.254'
-  'name': 'EXTERNAL'
-- cidr: '192.168.122.0/24'
-  gateway: '192.168.122.1'
-  ip_ranges:
-  - 'start': '192.168.122.1'
-    'end': '192.168.122.254'
-  name: 'PUBLICAPI'
-- cidr: '192.168.122.0/24'
-  gateway: '192.168.122.1'
-  ip_ranges:
-  - 'start': '192.168.122.1'
-    'end': '192.168.122.254'
-  name: 'physnet1'
+  - cidr: '192.168.122.0/24'
+    gateway: '192.168.122.1'
+    ip_ranges:
+    - 'start': '192.168.122.1'
+      'end': '192.168.122.254'
+    name: 'MANAGEMENT'
+  - cidr: '192.168.122.0/24'
+    gateway: '192.168.122.1'
+    ip_ranges:
+    - start: '192.168.122.1'
+      end: '192.168.122.254'
+    name: 'STORAGE'
+  - cidr: '192.168.2.0/24'
+    gateway: '192.168.2.1'
+    ip_ranges:
+    - 'start': '192.168.2.1'
+      'end': '192.168.2.254'
+    'name': 'EXTERNAL'
+  - cidr: '192.168.122.0/24'
+    gateway: '192.168.122.1'
+    ip_ranges:
+    - 'start': '192.168.122.1'
+      'end': '192.168.122.254'
+    name: 'PUBLICAPI'
+  - cidr: '192.168.122.0/24'
+    gateway: '192.168.122.1'
+    ip_ranges:
+    - 'start': '192.168.122.1'
+      'end': '192.168.122.254'
+    name: 'physnet1'
 
 internal_vip: '192.168.122.144'
 
diff --git a/deploy/get_conf.py b/deploy/get_conf.py
index 31ccaca0..d2b505c8 100755
--- a/deploy/get_conf.py
+++ b/deploy/get_conf.py
@@ -76,7 +76,7 @@ def network(s, seq, network=None):
 @hostdecorator
 def interface(s, seq, host=None):
     hostname = host.get('name', '')
-    interface = host.get('interface', '')[0]
+    interface = host.get('interface', '')
     map = {}
     map[hostname] = interface
     return map