2017-01-18 19:49:48 +01:00
|
|
|
References: bsc#1010060
|
|
|
|
|
2020-09-16 19:23:41 +02:00
|
|
|
Index: virt-manager-3.0.0/virtinst/install/urldetect.py
|
2017-01-18 19:49:48 +01:00
|
|
|
===================================================================
|
2020-09-16 19:23:41 +02:00
|
|
|
--- virt-manager-3.0.0.orig/virtinst/install/urldetect.py
|
|
|
|
+++ virt-manager-3.0.0/virtinst/install/urldetect.py
|
|
|
|
@@ -277,6 +277,12 @@ class _SUSEContent(object):
|
2018-10-30 23:00:52 +01:00
|
|
|
self.product_name.strip().rsplit(' ')[5][2])
|
|
|
|
distro_version = sle_version
|
|
|
|
|
|
|
|
+ # SUSE Container as a Service Platform
|
|
|
|
+ if "Container" in self.product_name:
|
|
|
|
+ distro_version = self.product_name.strip().rsplit(' ')[6]
|
|
|
|
+ elif "CaaS" in self.product_name:
|
|
|
|
+ distro_version = self.product_name.strip().rsplit(' ')[3]
|
|
|
|
+
|
|
|
|
return distro_version
|
2017-01-18 19:49:48 +01:00
|
|
|
|
|
|
|
|
2020-09-16 19:23:41 +02:00
|
|
|
@@ -563,6 +569,9 @@ class _SuseDistro(_RHELDistro):
|
|
|
|
|
|
|
|
version = distro_version.split('.', 1)[0].strip()
|
2018-10-30 23:00:52 +01:00
|
|
|
|
|
|
|
+ if self._variant_prefix.startswith(("caasp")):
|
|
|
|
+ return self._variant_prefix + distro_version
|
2017-09-15 23:07:50 +02:00
|
|
|
+
|
2020-09-16 19:23:41 +02:00
|
|
|
if str(self._variant_prefix).startswith(("sles", "sled", "oes")):
|
|
|
|
sp_version = ""
|
|
|
|
if len(distro_version.split('.', 1)) == 2:
|
|
|
|
@@ -632,6 +641,14 @@ class _OpensuseDistro(_SuseDistro):
|
2018-10-30 23:00:52 +01:00
|
|
|
famregex = ".*openSUSE.*"
|
|
|
|
|
|
|
|
|
2019-02-04 19:46:20 +01:00
|
|
|
+class _CAASPDistro(_SuseDistro):
|
2018-10-30 23:00:52 +01:00
|
|
|
+ PRETTY_NAME = "SLES"
|
2019-02-04 19:46:20 +01:00
|
|
|
+ matching_distros = ["caasp"]
|
2018-10-30 23:00:52 +01:00
|
|
|
+ _variant_prefix = "caasp"
|
|
|
|
+ _suse_regex = [".*SUSE Container as a Service Platform*", ".*SUSE CaaS Platform*"]
|
2019-03-25 17:16:57 +01:00
|
|
|
+ famregex = ".*(SUSE Container as a Service Platform|SUSE CaaS Platform).*"
|
2017-01-18 19:49:48 +01:00
|
|
|
+
|
2017-09-15 23:07:50 +02:00
|
|
|
+
|
2019-02-04 19:46:20 +01:00
|
|
|
class _OESDistro(_SuseDistro):
|
2018-10-30 23:00:52 +01:00
|
|
|
PRETTY_NAME = "OES"
|
2019-02-04 19:46:20 +01:00
|
|
|
matching_distros = ["oes"]
|
2020-09-16 19:23:41 +02:00
|
|
|
@@ -869,6 +886,7 @@ def _build_distro_list(osobj):
|
2019-07-29 21:36:33 +02:00
|
|
|
_SLESDistro,
|
|
|
|
_SLEDDistro,
|
|
|
|
_OpensuseDistro,
|
|
|
|
+ _CAASPDistro,
|
|
|
|
_OESDistro,
|
|
|
|
_DebianDistro,
|
|
|
|
_UbuntuDistro,
|