diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 4a748c2350a..a8f923d708d 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -49,7 +49,7 @@ 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 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 ac2194cff97..eb5095a8b6a 100644 --- a/ui/src/views/compute/wizard/NetworkConfiguration.vue +++ b/ui/src/views/compute/wizard/NetworkConfiguration.vue @@ -263,7 +263,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)