From 3b0e6ac90c0aeafdfaf89fd966e440e0d689eefb Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Wed, 24 Apr 2024 14:51:50 +0200
Subject: [PATCH 1/3] VR: fix dnmasq misconfiguration if there are multiple IP
 ranges in a shared network (#8741)

---
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |  2 +-
 systemvm/debian/opt/cloud/bin/cs/CsHelper.py       | 14 ++++++--------
 .../views/compute/wizard/NetworkConfiguration.vue  |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
index d653093a9f2..8f1562b0b82 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
@@ -127,7 +127,7 @@ class CsDhcp(CsDataBag):
             line = "dhcp-option=%s,26,%s" % (device, i['mtu'])
             self.conf.search(sline, line)
 
-        # Netmask
+            # Netmask
             netmask = ''
             if self.config.is_vpc():
                 netmask = gn.get_netmask()
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsHelper.py b/systemvm/debian/opt/cloud/bin/cs/CsHelper.py
index b7db1b3fe16..2a83c215403 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsHelper.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsHelper.py
@@ -113,22 +113,20 @@ def bool_to_yn(val):
 def get_device_info():
     """ Returns all devices on system with their ipv4 ip netmask """
     list = []
+    mtu = None
     for i in execute("ip addr show |grep -v secondary"):
         vals = i.strip().lstrip().rstrip().split()
-        if re.search('[0-9]:',vals[0]):
-            to={}
-            to['mtu'] = vals[4]
-            list.append(to)
+        if re.search('[0-9]:', vals[0]):
+            mtu = vals[4]
 
         if vals[0] == "inet":
-            if len(list) > 0:
-                to = list.pop(len(list)-1)
-            else:
-                to={}
+            to = {}
             to['ip'] = vals[1]
             to['dev'] = vals[-1]
             to['network'] = IPNetwork(to['ip'])
             to['dnsmasq'] = False
+            if mtu:
+                to['mtu'] = mtu
             list.append(to)
     return list
 
diff --git a/ui/src/views/compute/wizard/NetworkConfiguration.vue b/ui/src/views/compute/wizard/NetworkConfiguration.vue
index a31f7f4cb61..a4bc409619b 100644
--- a/ui/src/views/compute/wizard/NetworkConfiguration.vue
+++ b/ui/src/views/compute/wizard/NetworkConfiguration.vue
@@ -241,7 +241,7 @@ export default {
         return Promise.resolve()
       } else if (!this.ipV4Regex.test(value)) {
         return Promise.reject(this.$t('message.error.ipv4.address'))
-      } else if (rule.networkType !== 'L2' && !this.isIp4InCidr(value, rule.cidr)) {
+      } else if (rule.networkType === 'Isolated' && !this.isIp4InCidr(value, rule.cidr)) {
         const rangeIps = this.calculateCidrRange(rule.cidr)
         const message = `${this.$t('message.error.ip.range')} ${this.$t('label.from')} ${rangeIps[0]} ${this.$t('label.to')} ${rangeIps[1]}`
         return Promise.reject(message)

From 77df9ad4d788d0f452ed2c82970de9a534278a27 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 25 Apr 2024 09:43:50 +0530
Subject: [PATCH 2/3] codecov: fix Github action workflow

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .github/workflows/codecov.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index fcbcf9b8bfc..2a45e87d41e 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -47,9 +47,11 @@ jobs:
           cd nonoss && bash -x install-non-oss.sh && cd ..
           mvn -P quality -Dsimulator -Dnoredist clean install -T$(nproc)
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           files: ./client/target/site/jacoco-aggregate/jacoco.xml
           fail_ci_if_error: true
+          flags: unittests
           verbose: true
           name: codecov
+          token: ${{ secrets.CODECOV_TOKEN }}

From 4c27574570d183e5f9203be0164fed9d4295302e Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 25 Apr 2024 09:46:37 +0530
Subject: [PATCH 3/3] .github: fix codecov action configuration

`token` is documented to work with codecov-action@v4

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .github/workflows/ci.yml | 2 +-
 .github/workflows/ui.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87edfe890b0..6a6ea33b14a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -312,7 +312,7 @@ jobs:
           echo -e "Simulator CI Test Results: (only failures listed)\n"
           python3 ./tools/marvin/xunit-reader.py integration-test-results/
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           files: jacoco-coverage.xml
           fail_ci_if_error: true
diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
index b3230eeaca3..476526aff32 100644
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -55,7 +55,7 @@ jobs:
           npm run lint
           npm run test:unit
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           working-directory: ui
           files: ./coverage/lcov.info