X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packages%2Ftest_lib.py;h=4fc26f32bd02300116046d6c1e786c93c201db30;hb=0457d62d378931bb7f6a078add46583feca0ad0b;hp=8a5a2ddce89542471ddb6faca82a96f31c7af0ed;hpb=d2899bbe305a7dc856aa5eb965b9edad64f0f045;p=integration%2Fpackaging.git

diff --git a/packages/test_lib.py b/packages/test_lib.py
index 8a5a2dd..4fc26f3 100644
--- a/packages/test_lib.py
+++ b/packages/test_lib.py
@@ -19,227 +19,134 @@ class TestExtractVersion(unittest.TestCase):
 
     nexus_url = "https://nexus.opendaylight.org/content/repositories"
 
-    def test_carbon_release_url(self):
-        """Test URL of the ODL Carbon release."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz" % self.nexus_url
+    def test_oxygen_release_url(self):
+        """Test URL of the ODL Oxygen release."""
+        url = "%s/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "0")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "1")
-        self.assertEqual(version["codename"], "-Carbon")
-
-    def test_carbon_release_zip_url(self):
-        """Test URL of the ODL Carbon release zip archive."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.zip" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "0")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "1")
-        self.assertEqual(version["codename"], "-Carbon")
-
-    def test_carbon_sr1_release_url(self):
-        """Test URL of the ODL Carbon SR1 release."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.1-Carbon/distribution-karaf-0.6.1-Carbon.tar.gz" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "1")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "1")
-        self.assertEqual(version["codename"], "-Carbon")
-
-    def test_carbon_sr1_release_zip_url(self):
-        """Test URL of the ODL Carbon SR1 release zip archive."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.1-Carbon/distribution-karaf-0.6.1-Carbon.zip" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "1")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "1")
-        self.assertEqual(version["codename"], "-Carbon")
-
-    def test_nitrogen_release_url(self):
-        """Test URL of the ODL Nitrogen release."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
+        self.assertEqual(version["version_major"], "8")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
         self.assertEqual(version["pkg_version"], "1")
         self.assertEqual(version["codename"], "")
 
-    def test_nitrogen_release_zip_url(self):
-        """Test URL of the ODL Nitrogen release zip archive."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.zip" % self.nexus_url
+    def test_oxygen_release_zip_url(self):
+        """Test URL of the ODL Oxygen release zip archive."""
+        url = "%s/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.zip" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
+        self.assertEqual(version["version_major"], "8")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
         self.assertEqual(version["pkg_version"], "1")
         self.assertEqual(version["codename"], "")
 
-    def test_nitrogen_sr1_release_url(self):
-        """Test URL of the ODL Nitrogen SR1 release."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
-        self.assertEqual(version["version_minor"], "1")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "1")
-        self.assertEqual(version["codename"], "")
-
-    def test_nitrogen_release_zip_url(self):
-        """Test URL of the ODL Nitrogen release zip archive."""
-        url = "%s/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.zip" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
-        self.assertEqual(version["version_minor"], "1")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "1")
-        self.assertEqual(version["codename"], "")
-
-    def test_carbon_autorelease_url(self):
-        """Test URL of an ODL Carbon autorelease build."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/autorelease-2101/org/opendaylight/integration/distribution-karaf/0.6.4-Carbon/distribution-karaf-0.6.4-Carbon.tar.gz" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "4")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180225rel2101")
-        self.assertEqual(version["codename"], "-Carbon")
-
-    def test_carbon_autorelease_zip_url(self):
-        """Test URL of an ODL Carbon autorelease build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/autorelease-2101/org/opendaylight/integration/distribution-karaf/0.6.4-Carbon/distribution-karaf-0.6.4-Carbon.zip" % self.nexus_url
+    def test_oxygen_sr1_url(self):
+        """Test URL of the ODL Oxygen SR2."""
+        url = "%s/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "4")
-        self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180225rel2101")
-        self.assertEqual(version["codename"], "-Carbon")
-
-    def test_nitrogen_autorelease_url(self):
-        """Test URL of an ODL Nitrogen autorelease build."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/autorelease-2096/org/opendaylight/integration/karaf/0.7.2/karaf-0.7.2.tar.gz" % self.nexus_url
-        version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
+        self.assertEqual(version["version_major"], "8")
         self.assertEqual(version["version_minor"], "2")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180221rel2096")
+        self.assertEqual(version["pkg_version"], "1")
         self.assertEqual(version["codename"], "")
 
-    def test_nitrogen_autorelease_zip_url(self):
-        """Test URL of an ODL Nitrogen autorelease build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/autorelease-2096/org/opendaylight/integration/karaf/0.7.2/karaf-0.7.2.zip" % self.nexus_url
+    def test_oxygen_sr1_zip_url(self):
+        """Test URL of the ODL Oxygen SR2 zip archive."""
+        url = "%s/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.zip" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
+        self.assertEqual(version["version_major"], "8")
         self.assertEqual(version["version_minor"], "2")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180221rel2096")
+        self.assertEqual(version["pkg_version"], "1")
         self.assertEqual(version["codename"], "")
 
-    def test_carbon_snapshot_url(self):
-        """Test URL of an ODL Carbon snapshot build."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20180202.185215-498.tar.gz" % self.nexus_url
+    def test_oxygen_snapshot_url(self):
+        """Test URL of an ODL Oxygen snapshot build."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.8.0-SNAPSHOT/araf-0.8.0-20180202.194543-1393.tar.gz" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "3")
+        self.assertEqual(version["version_major"], "8")
+        self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180202snap498")
+        self.assertEqual(version["pkg_version"], "0.1.20180202snap1393")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_carbon_snapshot_zip_url(self):
-        """Test URL of an ODL Carbon snapshot build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20180202.185215-498.zip" % self.nexus_url
+    def test_oxygen_snapshot_zip_url(self):
+        """Test URL of an ODL Oxygen snapshot build zip archive."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180202.194543-1393.zip" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "3")
+        self.assertEqual(version["version_major"], "8")
+        self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180202snap498")
+        self.assertEqual(version["pkg_version"], "0.1.20180202snap1393")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_nitrogen_snapshot_url(self):
-        """Test URL of an ODL Nitrogen snapshot build."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20180130.170631-330.tar.gz" % self.nexus_url
+    def test_fluorine_snapshot_url(self):
+        """Test URL of an ODL Fluorine snapshot build."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180411.203859-563.tar.gz" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
-        self.assertEqual(version["version_minor"], "2")
+        self.assertEqual(version["version_major"], "9")
+        self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180130snap330")
+        self.assertEqual(version["pkg_version"], "0.1.20180411snap563")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_nitrogen_snapshot_zip_url(self):
-        """Test URL of an ODL Nitrogen snapshot build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20180130.170631-330.zip" % self.nexus_url
+    def test_fluorine_snapshot_zip_url(self):
+        """Test URL of an ODL Fluorine snapshot build zip archive."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180411.203859-563.tar.gz" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
-        self.assertEqual(version["version_minor"], "2")
+        self.assertEqual(version["version_major"], "9")
+        self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180130snap330")
+        self.assertEqual(version["pkg_version"], "0.1.20180411snap563")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_oxygen_snapshot_url(self):
-        """Test URL of an ODL Oxygen snapshot build."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180202.194543-1393.tar.gz" % self.nexus_url
+    def test_neon_snapshot_url(self):
+        """Test URL of an ODL Neon snapshot build."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181004.142605-697.tar.gz" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "8")
+        self.assertEqual(version["version_major"], "10")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180202snap1393")
+        self.assertEqual(version["pkg_version"], "0.1.20181004snap697")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_oxygen_snapshot_zip_url(self):
-        """Test URL of an ODL Oxygen snapshot build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180202.194543-1393.zip" % self.nexus_url
+    def test_neon_snapshot_zip_url(self):
+        """Test URL of an ODL Neon snapshot build zip archive."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181004.142605-697.zip" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "8")
+        self.assertEqual(version["version_major"], "10")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180202snap1393")
+        self.assertEqual(version["pkg_version"], "0.1.20181004snap697")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_carbon_multipatch_zip_url(self):
-        """Test URL of an ODL Carbon multipatch-test build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20180115.181738-1.zip" % self.nexus_url
+    def test_oxygen_multipatch_zip_url(self):
+        """Test URL of an ODL Oxygen multipatch-test build zip archive."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180204.191936-134.zip" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "6")
-        self.assertEqual(version["version_minor"], "3")
+        self.assertEqual(version["version_major"], "8")
+        self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180115snap1")
+        self.assertEqual(version["pkg_version"], "0.1.20180204snap134")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_nitrogen_multipatch_zip_url(self):
-        """Test URL of an ODL Nitrogen multipatch-test build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20180115.183312-2.zip" % self.nexus_url
+    def test_fluorine_multipatch_zip_url(self):
+        """Test URL of an ODL Fluorine multipatch-test build zip archive."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "7")
-        self.assertEqual(version["version_minor"], "2")
+        self.assertEqual(version["version_major"], "9")
+        self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180115snap2")
+        self.assertEqual(version["pkg_version"], "0.1.20180531snap59")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
-    def test_oxygen_multipatch_zip_url(self):
-        """Test URL of an ODL Oxygen multipatch-test build zip archive."""
-        # NB: This will need to be updated as old builds expire
-        url = "%s/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180204.191936-134.zip" % self.nexus_url
+    def test_neon_multipatch_zip_url(self):
+        """Test URL of an ODL Neon multipatch-test build zip archive."""
+        url = "%s/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20180925.093600-5.zip" % self.nexus_url
         version = lib.extract_version(url)
-        self.assertEqual(version["version_major"], "8")
+        self.assertEqual(version["version_major"], "10")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["pkg_version"], "0.1.20180204snap134")
+        self.assertEqual(version["pkg_version"], "0.1.20180925snap5")
         self.assertEqual(version["codename"], "-SNAPSHOT")
 
 
@@ -256,56 +163,75 @@ class TestGetSnapURL(unittest.TestCase):
         self.assertNotIn("release", snap_url)
         self.assertNotIn("public", snap_url)
 
-    def test_carbon(self):
-        """Test Carbon major version gives sane snapshot URL."""
-        self.validate_snap_url(lib.get_snap_url("6"))
-
-    def test_nitrogen(self):
-        """Test Nitrogen major version gives sane snapshot URL."""
-        self.validate_snap_url(lib.get_snap_url("7"))
-
     def test_oxygen(self):
         """Test Oxygen major version gives sane snapshot URL."""
         self.validate_snap_url(lib.get_snap_url("8"))
 
+    def test_fluorine(self):
+        """Test Fluorine major version gives sane snapshot URL."""
+        self.validate_snap_url(lib.get_snap_url("9"))
 
-class TestGetDistroNamePrefix(unittest.TestCase):
+    def test_neon(self):
+        """Test Neon major version gives sane snapshot URL."""
+        self.validate_snap_url(lib.get_snap_url("10"))
 
-    """Test logic to get Karaf 3/4 distro name prefix per ODL major version."""
 
-    k3_distro_prefix = "distribution-karaf"
-    k4_distro_prefix = "karaf"
+class TestGetDistroNamePrefix(unittest.TestCase):
 
-    def test_carbon(self):
-        """Test Carbon major version gives Karaf 3 prefix."""
-        distro_prefix = lib.get_distro_name_prefix("6")
-        self.assertEqual(distro_prefix, self.k3_distro_prefix)
+    """Test logic to get Karaf 3/4 or Managed Release Common distro prefixes."""
 
-    def test_nitrogen(self):
-        """Test Nitrogen major version gives Karaf 4 prefix."""
-        distro_prefix = lib.get_distro_name_prefix("7")
-        self.assertEqual(distro_prefix, self.k4_distro_prefix)
+    mrel_distro_prefix = "opendaylight"
+    k4_distro_prefix = "karaf"
+    k3_distro_prefix = "distribution-karaf"
+    mrel_distro_url = "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.9.0/opendaylight-0.9.0.tar.gz"
+    k4_distro_url = "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/karaf/0.8.3/karaf-0.8.3.tar.gz"
+    k3_distro_url = "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.6.4-Carbon/distribution-karaf-0.6.4-Carbon.tar.gz"
 
     def test_oxygen(self):
         """Test Oxygen major version gives Karaf 4 prefix."""
         distro_prefix = lib.get_distro_name_prefix("8")
         self.assertEqual(distro_prefix, self.k4_distro_prefix)
 
-    def test_carbon_int(self):
-        """Test Carbon major version as int gives Karaf 3 prefix."""
-        distro_prefix = lib.get_distro_name_prefix(6)
-        self.assertEqual(distro_prefix, self.k3_distro_prefix)
-
-    def test_nitrogen_int(self):
-        """Test Nitrogen major version as int gives Karaf 4 prefix."""
-        distro_prefix = lib.get_distro_name_prefix(7)
-        self.assertEqual(distro_prefix, self.k4_distro_prefix)
-
     def test_oxygen_int(self):
         """Test Oxygen major version as int gives Karaf 4 prefix."""
         distro_prefix = lib.get_distro_name_prefix(8)
         self.assertEqual(distro_prefix, self.k4_distro_prefix)
 
+    def test_fluorine(self):
+        """Test Fluorine major version gives Karaf 4 prefix."""
+        distro_prefix = lib.get_distro_name_prefix("9")
+        self.assertEqual(distro_prefix, self.k4_distro_prefix)
+
+    def test_fluorine_int(self):
+        """Test Fluorine major version as int gives Karaf 4 prefix."""
+        distro_prefix = lib.get_distro_name_prefix(9)
+        self.assertEqual(distro_prefix, self.k4_distro_prefix)
+
+    def test_neon(self):
+        """Test Neon major version gives Karaf 4 prefix."""
+        distro_prefix = lib.get_distro_name_prefix("10")
+        self.assertEqual(distro_prefix, self.k4_distro_prefix)
+
+    def test_neon_int(self):
+        """Test Neon major version as int gives Karaf 4 prefix."""
+        distro_prefix = lib.get_distro_name_prefix(10)
+        self.assertEqual(distro_prefix, self.k4_distro_prefix)
+
+    def test_managed_release_fluorine(self):
+        """Test Managed Release URL gives MR distro prefix."""
+        distro_prefix = lib.get_distro_name_prefix(9, self.mrel_distro_url)
+        self.assertEqual(distro_prefix, self.mrel_distro_prefix)
+
+    def test_k4_norm_release_oxygen(self):
+        """Test normal K4 URL gives distro prefix based on Karaf version."""
+        distro_prefix = lib.get_distro_name_prefix(9, self.k4_distro_url)
+        self.assertEqual(distro_prefix, self.k4_distro_prefix)
+
+    def test_k3_norm_release_carbon(self):
+        """Test normal K3 URL gives distro prefix based on Karaf version."""
+        distro_prefix = lib.get_distro_name_prefix(6, self.k3_distro_url)
+        self.assertEqual(distro_prefix, self.k3_distro_prefix)
+
 
 class TestGetSysdCommit(unittest.TestCase):
 
@@ -337,48 +263,48 @@ class TestGetJavaVersion(unittest.TestCase):
         self.assertIsInstance(java_version, int)
 
     def test_type_given_str(self):
-        """Pass int, check that returned value is of the right type."""
+        """Pass str, check that returned value is of the right type."""
         java_version = lib.get_java_version("6")
         self.assertIsInstance(java_version, int)
 
     def test_old_given_int(self):
-        """Pass old ODL major version, check that Java 7 returned."""
+        """Pass old ODL major version as int, check that Java 7 returned."""
         java_version = lib.get_java_version(4)
         self.assertEqual(java_version, 7)
 
     def test_old_given_str(self):
-        """Pass old ODL major version, check that Java 7 returned."""
+        """Pass old ODL major version as str, check that Java 7 returned."""
         java_version = lib.get_java_version("4")
         self.assertEqual(java_version, 7)
 
-    def test_carbon_given_int(self):
-        """Pass Carbon major version, check that Java 8 returned."""
-        java_version = lib.get_java_version(6)
+    def test_oxygen_given_int(self):
+        """Pass Oxygen major version as int, check that Java 8 returned."""
+        java_version = lib.get_java_version(8)
         self.assertEqual(java_version, 8)
 
-    def test_carbon_given_str(self):
-        """Pass Carbon major version, check that Java 8 returned."""
-        java_version = lib.get_java_version("6")
+    def test_oxygen_given_str(self):
+        """Pass Oxygen major version as str, check that Java 8 returned."""
+        java_version = lib.get_java_version("8")
         self.assertEqual(java_version, 8)
 
-    def test_nitrogen_given_int(self):
-        """Pass Nitrogen major version, check that Java 8 returned."""
-        java_version = lib.get_java_version(7)
+    def test_fluorine_given_int(self):
+        """Pass Fluorine major version as int, check that Java 8 returned."""
+        java_version = lib.get_java_version(9)
         self.assertEqual(java_version, 8)
 
-    def test_nitrogen_given_str(self):
-        """Pass Nitrogen major version, check that Java 8 returned."""
-        java_version = lib.get_java_version("7")
+    def test_fluorine_given_str(self):
+        """Pass Fluorine major version as str, check that Java 8 returned."""
+        java_version = lib.get_java_version("9")
         self.assertEqual(java_version, 8)
 
-    def test_oxygen_given_int(self):
-        """Pass Oxygen major version, check that Java 8 returned."""
-        java_version = lib.get_java_version(8)
+    def test_neon_given_int(self):
+        """Pass Neon major version as int, check that Java 8 returned."""
+        java_version = lib.get_java_version(10)
         self.assertEqual(java_version, 8)
 
-    def test_oxygen_given_str(self):
-        """Pass Oxygen major version, check that Java 8 returned."""
-        java_version = lib.get_java_version("8")
+    def test_neon_given_str(self):
+        """Pass Neon major version as str, check that Java 8 returned."""
+        java_version = lib.get_java_version("10")
         self.assertEqual(java_version, 8)