Fix incorrect network configuration

    [Feature]       Fix incorrect network configuration.
    [Cause]         Incorrect network netmask, filter name, ip address.
    [Solution]      N/A
    [Verification]  Build, install on new minimal image, run tests.

Change-Id: Idc1ddcd06c73297581f778b78d392bc34020c3cc
Signed-off-by: Dariusz Michaluk <d.michaluk@samsung.com>

diff --git a/server/configs/libvirt-config/business-network.xml b/server/configs/libvirt-config/business-network.xml
index beb5c80..dbfc6c4 100644 (file)
--- a/server/configs/libvirt-config/business-network.xml
+++ b/server/configs/libvirt-config/business-network.xml
@@ -4,7 +4,7 @@
     <bridge name="virbr-business"/>
     <forward/>
     <dns forwardPlainNames="yes"/>
-    <ip address="10.0.102.1" netmask="255.0.0.0">
+    <ip address="10.0.102.1" netmask="255.255.255.0">
         <dhcp>
             <range start="10.0.102.2" end="10.0.102.2"/>
         </dhcp>

diff --git a/server/configs/libvirt-config/business-nwfilter.xml b/server/configs/libvirt-config/business-nwfilter.xml
index ea7453e..6548f58 100644 (file)
--- a/server/configs/libvirt-config/business-nwfilter.xml
+++ b/server/configs/libvirt-config/business-nwfilter.xml
@@ -1,8 +1,8 @@
-<filter name='business-nwfilter' chain='root'>
+<filter name='nwfilter-business' chain='root'>
     <rule action='reject' direction='in' priority='100'>
-        <ip srcipaddr='10.0.0.0' srcipmask='255.0.0.0'/>
+        <ip srcipaddr='10.0.102.0' srcipmask='255.255.255.0'/>
     </rule>
     <rule action='reject' direction='out' priority='100'>
-        <ip dstipaddr='10.0.0.0' srcipmask='255.0.0.0'/>
+        <ip dstipaddr='10.0.102.0' srcipmask='255.255.255.0'/>
     </rule>
 </filter>

diff --git a/server/configs/libvirt-config/business.xml b/server/configs/libvirt-config/business.xml
index c2539e9..7564d8b 100644 (file)
--- a/server/configs/libvirt-config/business.xml
+++ b/server/configs/libvirt-config/business.xml
@@ -99,7 +99,7 @@
 
     <interface type='network'>
       <source network='business'/>
-      <filterref filter='business-nwfilter'/>
+      <filterref filter='nwfilter-business'/>
     </interface>
     <filesystem type='mount'>
       <!-- TODO: this directory could be generated from .conf files-->

diff --git a/server/configs/libvirt-config/private-network.xml b/server/configs/libvirt-config/private-network.xml
index f917b52..7dec5a9 100644 (file)
--- a/server/configs/libvirt-config/private-network.xml
+++ b/server/configs/libvirt-config/private-network.xml
@@ -4,7 +4,7 @@
     <bridge name="virbr-private"/>
     <forward/>
     <dns forwardPlainNames="yes"/>
-    <ip address="10.0.101.1" netmask="255.0.0.0">
+    <ip address="10.0.101.1" netmask="255.255.255.0">
         <dhcp>
             <range start="10.0.101.2" end="10.0.101.2"/>
         </dhcp>

diff --git a/server/configs/libvirt-config/private-nwfilter.xml b/server/configs/libvirt-config/private-nwfilter.xml
index f3bd8ca..12dc793 100644 (file)
--- a/server/configs/libvirt-config/private-nwfilter.xml
+++ b/server/configs/libvirt-config/private-nwfilter.xml
@@ -1,8 +1,8 @@
-<filter name='private-nwfilter' chain='root'>
+<filter name='nwfilter-private' chain='root'>
     <rule action='reject' direction='in' priority='100'>
-        <ip srcipaddr='10.0.0.0' srcipmask='255.0.0.0'/>
+        <ip srcipaddr='10.0.101.0' srcipmask='255.255.255.0'/>
     </rule>
     <rule action='reject' direction='out' priority='100'>
-        <ip dstipaddr='10.0.0.0' srcipmask='255.0.0.0'/>
+        <ip dstipaddr='10.0.101.0' srcipmask='255.255.255.0'/>
     </rule>
 </filter>

diff --git a/server/configs/libvirt-config/private.xml b/server/configs/libvirt-config/private.xml
index d6ce465..b665a80 100644 (file)
--- a/server/configs/libvirt-config/private.xml
+++ b/server/configs/libvirt-config/private.xml
@@ -99,7 +99,7 @@
 
     <interface type='network'>
       <source network='private'/>
-      <filterref filter='private-nwfilter'/>
+      <filterref filter='nwfilter-private'/>
     </interface>
     <filesystem type='mount'>
       <!-- TODO: this directory could be generated from .conf files-->

diff --git a/tests/integration_tests/network_tests/network_common.py b/tests/integration_tests/network_tests/network_common.py
index 2b64920..63289a6 100755 (executable)
--- a/tests/integration_tests/network_tests/network_common.py
+++ b/tests/integration_tests/network_tests/network_common.py
@@ -235,7 +235,7 @@ def twoNetworks():
     # 0. Test data
     containers_list      = [CONTAINER_T1, CONTAINER_T2]
     dest_containers_list = [CONTAINER_T2, CONTAINER_T1]
-    test_ip_list         = [["192.168.101.2"], ["192.168.102.2"]]
+    test_ip_list         = [["10.0.101.2"], ["10.0.102.2"]]
     test_1_expected_res  = [ 0,  0]
     test_2_expected_res  = [-1, -1]