[cloudstack] branch 4.16 updated: Fix linux native bridge for SUSE in cloudutils (#6134)

[nv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.16 by this push:
     new fb43076  Fix linux native bridge for SUSE in cloudutils (#6134)
fb43076 is described below

commit fb43076f9e1a51ccd51cfd108682c8ad0537936b
Author: Michael <35...@users.noreply.github.com>
AuthorDate: Wed Mar 23 17:42:15 2022 +0100

    Fix linux native bridge for SUSE in cloudutils (#6134)
    
    * fix linux native bridge for SUSE
    
    * apply suggestion
---
 python/lib/cloudutils/serviceConfig.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
index b9ee7d5..61c64cd 100755
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -374,6 +374,9 @@ class networkConfigSUSE(serviceCfgBase, networkConfigBase):
         if self.syscfg.env.bridgeType == "openvswitch":
             if cfo.getEntry("IPADDR"):
                 cfo.rmEntry("IPADDR", cfo.getEntry("IPADDR"))
+        elif self.syscfg.env.bridgeType == "native":
+            # Bridge is linked to the dev in SUSE not the other way round
+            pass
         else:
             raise CloudInternalException("Unknown network.bridge.type %s" % self.syscfg.env.bridgeType)
         cfo.save()