[Libosinfo] [osinfo-db PATCH 4/4] opensuse: Standardize variant ids and names

[Fabiano Fidêncio]

Let's try to:
- Use "netinst" for whatever is a network installer
- Not add "dvd" variant, as its the "normal" one
- Remove tags differentiating netinst and dvd from its names, as mgmt
  apps will already add the needed tags for network installers

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 data/os/opensuse.org/opensuse-15.0.xml.in       | 10 +++-------
 data/os/opensuse.org/opensuse-42.3.xml.in       | 10 +++-------
 data/os/opensuse.org/opensuse-tumbleweed.xml.in | 15 +++++----------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/data/os/opensuse.org/opensuse-15.0.xml.in b/data/os/opensuse.org/opensuse-15.0.xml.in
index 4409620..fd86a45 100644
--- a/data/os/opensuse.org/opensuse-15.0.xml.in
+++ b/data/os/opensuse.org/opensuse-15.0.xml.in
@@ -13,16 +13,12 @@
 
     <release-date>2018-05-25</release-date>
 
-    <variant id="dvd">
-      <_name>openSUSE Leap 15.0 (DVD Image)</_name>
-    </variant>
-    <variant id="network">
-      <_name>openSUSE Leap 15.0 (Network Image)</_name>
+    <variant id="netinst">
+      <_name>openSUSE Leap 15.0</_name>
     </variant>
 
     <!-- DVD -->
     <media arch="x86_64">
-      <variant id="dvd"/>
       <url>http://download.opensuse.org/distribution/leap/15.0/iso/openSUSE-Leap-15.0-DVD-x86_64.iso</url>
       <iso>
         <volume-id>openSUSE-Leap-15.0-DVD-x86_64*</volume-id>
@@ -35,7 +31,7 @@
 
     <!-- Network -->
     <media arch="x86_64">
-      <variant id="network"/>
+      <variant id="netinst"/>
       <url>http://download.opensuse.org/distribution/leap/15.0/iso/openSUSE-Leap-15.0-NET-x86_64.iso</url>
       <iso>
         <volume-id>openSUSE-Leap-15.0-NET-x86_64*</volume-id>
diff --git a/data/os/opensuse.org/opensuse-42.3.xml.in b/data/os/opensuse.org/opensuse-42.3.xml.in
index 69efc9e..5bfee77 100644
--- a/data/os/opensuse.org/opensuse-42.3.xml.in
+++ b/data/os/opensuse.org/opensuse-42.3.xml.in
@@ -14,16 +14,12 @@
     <release-date>2017-07-26</release-date>
     <eol-date>2019-01-31</eol-date>
 
-    <variant id="dvd">
-      <_name>openSUSE Leap 42.3 (DVD Image)</_name>
-    </variant>
-    <variant id="network">
-      <_name>openSUSE Leap 42.3 (Network Image)</_name>
+    <variant id="netinst">
+      <_name>openSUSE Leap 42.3</_name>
     </variant>
 
     <!-- DVD -->
     <media arch="x86_64">
-      <variant id="dvd"/>
       <url>http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-DVD-x86_64.iso</url>
       <iso>
         <volume-id>openSUSE-Leap-42.3-DVD-x86_64*</volume-id>
@@ -36,7 +32,7 @@
 
     <!-- Network -->
     <media arch="x86_64">
-      <variant id="network"/>
+      <variant id="netinst"/>
       <url>http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-NET-x86_64.iso</url>
       <iso>
         <volume-id>openSUSE-Leap-42.3-NET-x86_64*</volume-id>
diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
index 0feb783..6e11215 100644
--- a/data/os/opensuse.org/opensuse-tumbleweed.xml.in
+++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
@@ -11,19 +11,15 @@
     <upgrades id="http://opensuse.org/opensuse/15.0"/>
     <derives-from id="http://opensuse.org/opensuse/15.0"/>
 
-    <variant id="dvd">
-      <_name>openSUSE Tumbleweed (DVD Image)</_name>
-    </variant>
-    <variant id="network">
-      <_name>openSUSE Tumbleweed (Network Image)</_name>
+    <variant id="netinst">
+      <_name>openSUSE Tumbleweed</_name>
     </variant>
     <variant id="kubic">
-      <_name>openSUSE Tumbleweed (Kubic DVD/USB Stick)</_name>
+      <_name>openSUSE Tumbleweed (Kubic)</_name>
     </variant>
 
     <!-- DVD Image -->
     <media arch="i686">
-      <variant id="dvd"/>
       <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url>
       <iso>
         <volume-id>openSUSE-Tumbleweed-DVD-i586*</volume-id>
@@ -34,7 +30,6 @@
       <initrd>boot/i386/loader/initrd</initrd>
     </media>
     <media arch="x86_64">
-      <variant id="dvd"/>
       <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso</url>
       <iso>
         <volume-id>openSUSE-Tumbleweed-DVD-x86_64*</volume-id>
@@ -47,7 +42,7 @@
 
     <!-- Network Image -->
     <media arch="i686">
-      <variant id="network"/>
+      <variant id="netinst"/>
       <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso</url>
       <iso>
         <volume-id>openSUSE-Tumbleweed-NET-i586*</volume-id>
@@ -58,7 +53,7 @@
       <initrd>boot/i386/loader/initrd</initrd>
     </media>
     <media arch="x86_64">
-      <variant id="network"/>
+      <variant id="netinst"/>
       <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso</url>
       <iso>
         <volume-id>openSUSE-Tumbleweed-NET-x86_64*</volume-id>
-- 
2.20.1