Modify the network and DHA files

Due to pod2 virtual3 and virtual4 run danube before,
we need to change the network and DHA to run euphrates

Change-Id: I720138cb960cc6f3a57bf5f777c0debb80f64eba
Signed-off-by: wutianwei <wutianwei1@huawei.com>

5 files changed, 201 insertions, 43 deletions

diff --git a/deploy/conf/vm_environment/huawei-virtual3/network.yml b/deploy/conf/vm_environment/huawei-virtual3/network.yml
index 40238276..4359202e 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network.yml
@@ -12,34 +12,42 @@ nic_mappings: []
 bond_mappings: []
 
 provider_net_mappings:
-  - name: br-prv
+  - name: br-provider
     network: physnet
-    interface: eth1
+    interface: eth10
     type: ovs
     role:
       - controller
-      - compute
 
 sys_intf_mappings:
   - name: mgmt
+    interface: eth0
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
     interface: eth1
+    type: normal
     vlan_tag: 101
-    type: vlan
     role:
       - controller
       - compute
 
   - name: storage
     interface: eth1
+    type: normal
     vlan_tag: 102
-    type: vlan
     role:
       - controller
       - compute
 
   - name: external
-    interface: br-prv
-    type: ovs
+    interface: eth1
+    type: normal
+    vlan_tag: None
     role:
       - controller
       - compute
@@ -47,8 +55,21 @@ sys_intf_mappings:
 ip_settings:
   - name: mgmt
     ip_ranges:
+      - - "10.1.0.50"
+        - "10.1.0.100"
+    dhcp_ranges:
+      - - "10.1.0.2"
+        - "10.1.0.49"
+    cidr: "10.1.0.0/24"
+    gw: "10.1.0.1"
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    ip_ranges:
       - - "172.16.1.1"
-        - "172.16.1.254"
+        - "172.16.1.50"
     cidr: "172.16.1.0/24"
     role:
       - controller
@@ -57,7 +78,7 @@ ip_settings:
   - name: storage
     ip_ranges:
       - - "172.16.2.1"
-        - "172.16.2.254"
+        - "172.16.2.50"
     cidr: "172.16.2.0/24"
     role:
       - controller
@@ -65,25 +86,30 @@ ip_settings:
 
   - name: external
     ip_ranges:
-      - - "192.168.101.210"
-        - "192.168.101.220"
-    cidr: "192.168.101.0/24"
-    gw: "192.168.101.1"
+      - - "192.16.1.210"
+        - "192.16.1.220"
+    cidr: "192.16.1.0/24"
+    gw: "192.16.1.1"
     role:
       - controller
       - compute
 
 internal_vip:
-  ip: 172.16.1.222
+  ip: 10.1.0.222
   netmask: "24"
   interface: mgmt
 
 public_vip:
-  ip: 192.168.101.222
+  ip: 192.16.1.222
   netmask: "24"
   interface: external
 
 onos_nic: eth2
+tenant_net_info:
+  type: vxlan
+  range: "1:1000"
+  provider_network: None
+
 public_net_info:
   enable: "True"
   network: ext-net
@@ -94,7 +120,7 @@ public_net_info:
   router: router-ext
   enable_dhcp: "False"
   no_gateway: "False"
-  external_gw: "192.168.101.1"
-  floating_ip_cidr: "192.168.101.0/24"
-  floating_ip_start: "192.168.101.101"
-  floating_ip_end: "192.168.101.199"
+  external_gw: "192.16.1.1"
+  floating_ip_cidr: "192.16.1.0/24"
+  floating_ip_start: "192.16.1.101"
+  floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml
new file mode 100644
index 00000000..e196d6f4
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml
@@ -0,0 +1,132 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+nic_mappings: []
+bond_mappings: []
+
+provider_net_mappings:
+  - name: br-provider
+    network: physnet
+    interface: eth10
+    type: ovs
+    role:
+      - controller
+
+sys_intf_mappings:
+  - name: mgmt
+    interface: eth0
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    interface: eth2
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+
+  - name: tenant
+    interface: eth2
+    type: dpdk
+    vlan_tag: None
+    role:
+      - compute
+
+  - name: storage
+    interface: eth1
+    type: normal
+    vlan_tag: 102
+    role:
+      - controller
+      - compute
+
+  - name: external
+    interface: eth1
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+ip_settings:
+  - name: mgmt
+    ip_ranges:
+      - - "10.1.0.50"
+        - "10.1.0.100"
+    dhcp_ranges:
+      - - "10.1.0.2"
+        - "10.1.0.49"
+    cidr: "10.1.0.0/24"
+    gw: "10.1.0.1"
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    ip_ranges:
+      - - "172.16.1.1"
+        - "172.16.1.50"
+    cidr: "172.16.1.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: storage
+    ip_ranges:
+      - - "172.16.2.1"
+        - "172.16.2.50"
+    cidr: "172.16.2.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: external
+    ip_ranges:
+      - - "192.16.1.210"
+        - "192.16.1.220"
+    cidr: "192.16.1.0/24"
+    gw: "192.16.1.1"
+    role:
+      - controller
+      - compute
+
+internal_vip:
+  ip: 10.1.0.222
+  netmask: "24"
+  interface: mgmt
+
+public_vip:
+  ip: 192.16.1.222
+  netmask: "24"
+  interface: external
+
+onos_nic: eth2
+tenant_net_info:
+  type: vxlan
+  range: "1:1000"
+  provider_network: None
+
+public_net_info:
+  enable: "True"
+  network: ext-net
+  type: flat
+  segment_id: 1000
+  subnet: ext-subnet
+  provider_network: physnet
+  router: router-ext
+  enable_dhcp: "False"
+  no_gateway: "False"
+  external_gw: "192.16.1.1"
+  floating_ip_cidr: "192.16.1.0/24"
+  floating_ip_start: "192.16.1.101"
+  floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
index dfda8d02..b5a57103 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
@@ -65,10 +65,10 @@ ip_settings:
 
   - name: external
     ip_ranges:
-      - - "192.168.101.210"
-        - "192.168.101.220"
-    cidr: "192.168.101.0/24"
-    gw: "192.168.101.1"
+      - - "192.168.107.210"
+        - "192.168.107.220"
+    cidr: "192.168.107.0/24"
+    gw: "192.168.107.1"
     role:
       - controller
       - compute
@@ -79,7 +79,7 @@ internal_vip:
   interface: mgmt
 
 public_vip:
-  ip: 192.168.101.222
+  ip: 192.168.107.222
   netmask: "24"
   interface: external
 
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
index 550093e5..ce5353eb 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
@@ -65,10 +65,10 @@ ip_settings:
 
   - name: external
     ip_ranges:
-      - - "192.168.101.210"
-        - "192.168.101.220"
-    cidr: "192.168.101.0/24"
-    gw: "192.168.101.1"
+      - - "192.168.107.210"
+        - "192.168.107.220"
+    cidr: "192.168.107.0/24"
+    gw: "192.168.107.1"
     role:
       - controller
       - compute
@@ -79,7 +79,7 @@ internal_vip:
   interface: mgmt
 
 public_vip:
-  ip: 192.168.101.222
+  ip: 192.168.107.222
   netmask: "24"
   interface: external
 
@@ -94,7 +94,7 @@ public_net_info:
   router: router-ext
   enable_dhcp: "False"
   no_gateway: "False"
-  external_gw: "192.168.101.1"
-  floating_ip_cidr: "192.168.101.0/24"
-  floating_ip_start: "192.168.101.101"
-  floating_ip_end: "192.168.101.199"
+  external_gw: "192.168.107.1"
+  floating_ip_cidr: "192.168.107.0/24"
+  floating_ip_start: "192.168.107.101"
+  floating_ip_end: "192.168.107.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
index fd2e2c0f..e0663439 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
@@ -65,10 +65,10 @@ ip_settings:
 
   - name: external
     ip_ranges:
-      - - "192.168.101.210"
-        - "192.168.101.220"
-    cidr: "192.168.101.0/24"
-    gw: "192.168.101.1"
+      - - "192.16.1.210"
+        - "192.16.1.220"
+    cidr: "192.16.1.0/24"
+    gw: "192.16.1.1"
     role:
       - controller
       - compute
@@ -79,12 +79,12 @@ internal_vip:
   interface: mgmt
 
 public_vip:
-  ip: 192.168.101.222
+  ip: 192.16.1.222
   netmask: "24"
   interface: external
 
 openo_net:
-  openo_ip: 192.168.101.50
+  openo_ip: 192.16.1.50
   openo_docker_gw: 172.11.1.1
   openo_docker_cidr: 172.11.1.0/24
 
@@ -99,7 +99,7 @@ public_net_info:
   router: router-ext
   enable_dhcp: "False"
   no_gateway: "False"
-  external_gw: "192.168.101.1"
-  floating_ip_cidr: "192.168.101.0/24"
-  floating_ip_start: "192.168.101.101"
-  floating_ip_end: "192.168.101.199"
+  external_gw: "192.16.1.1"
+  floating_ip_cidr: "192.16.1.0/24"
+  floating_ip_start: "192.16.1.101"
+  floating_ip_end: "192.16.1.199"