support onos l3 agent

JIRA: COMPASS-179

Change-Id: If052a122fce154f2327304a4436b6c6fdba6e7ac
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

diff --git a/deploy/conf/network_cfg.yaml b/deploy/conf/network_cfg.yaml
index d79ff8e..9997f7f 100644 (file)
--- a/deploy/conf/network_cfg.yaml
+++ b/deploy/conf/network_cfg.yaml
@@ -73,6 +73,7 @@ public_vip:
   netmask: "24"
   interface: external
 
+onos_nic: eth2
 public_net_info:
   enable: False
   network: ext-net

diff --git a/deploy/host_virtual.sh b/deploy/host_virtual.sh
index d769010..4cb3361 100644 (file)
--- a/deploy/host_virtual.sh
+++ b/deploy/host_virtual.sh
@@ -31,6 +31,7 @@ function launch_host_vms() {
           -e "s#REPLACE_IMAGE#$vm_dir/disk.img#g" \
           -e "s/REPLACE_BOOT_MAC/${mac_array[i]}/g" \
           -e "s/REPLACE_NET_INSTALL/install/g" \
+          -e "s/REPLACE_NET_IAAS/external/g" \
           -e "s/REPLACE_NET_TENANT/external/g" \
           $COMPASS_DIR/deploy/template/vm/host.xml\
           > $vm_dir/libvirt.xml

diff --git a/deploy/template/vm/host.xml b/deploy/template/vm/host.xml
index e6eca55..f65d4f0 100644 (file)
--- a/deploy/template/vm/host.xml
+++ b/deploy/template/vm/host.xml
@@ -32,10 +32,15 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </interface>
     <interface type='network'>
-      <source network='REPLACE_NET_TENANT'/>
+      <source network='REPLACE_NET_IAAS'/>
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </interface>
+    <interface type='network'>
+      <source network='REPLACE_NET_TENANT'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
+    </interface>
     <serial type='pty'>
       <source path='/dev/pts/0'/>
     </serial>