Merge "Introduce trivial helpers to manage image_files and names" into stable/queens

test-requirements.txt

@@ -12,6 +12,7 @@ sphinx!=1.6.6,>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 requests-mock>=1.1.0 # Apache-2.0
+testscenarios>=0.4  # Apache-2.0/BSD
 
 # releasenotes
 reno>=2.5.0 # Apache-2.0

tripleoclient/tests/test_utils.py

@@ -25,6 +25,7 @@ from uuid import uuid4
 
 import sys
 
+from testscenarios import TestWithScenarios
 from unittest import TestCase
 import yaml
 
@@ -1080,3 +1081,41 @@ class GetTripleoAnsibleInventory(TestCase):
                 ssh_user='heat_admin',
                 stack='foo-overcloud'
             )
+
+
+class TestOvercloudNameScenarios(TestWithScenarios):
+    scenarios = [
+        ('kernel_default',
+         dict(func=utils.overcloud_kernel,
+              basename='overcloud-full',
+              expected=('overcloud-full-vmlinuz', '.vmlinuz'))),
+        ('ramdisk_default',
+         dict(func=utils.overcloud_ramdisk,
+              basename='overcloud-full',
+              expected=('overcloud-full-initrd', '.initrd'))),
+        ('image_default',
+         dict(func=utils.overcloud_image,
+              basename='overcloud-full',
+              expected=('overcloud-full', '.qcow2'))),
+    ]
+
+    def test_overcloud_params(self):
+        observed = self.func(self.basename)
+
+        self.assertEqual(self.expected, observed)
+
+
+class TestDeployNameScenarios(TestWithScenarios):
+    scenarios = [
+        ('kernel_default',
+         dict(func=utils.deploy_kernel,
+              expected=('bm-deploy-kernel', '.kernel'))),
+        ('ramdisk_default',
+         dict(func=utils.deploy_ramdisk,
+              expected=('bm-deploy-ramdisk', '.initramfs'))),
+    ]
+
+    def test_deploy_params(self):
+        observed = self.func()
+
+        self.assertEqual(self.expected, observed)

tripleoclient/utils.py

@@ -1268,3 +1268,28 @@ def run_command_and_log(log, cmd, cwd=None, env=None, retcode_only=True):
         return proc.wait()
     else:
         return proc
+
+
+def overcloud_kernel(basename):
+    return ('%s-vmlinuz' % basename,
+            '.vmlinuz')
+
+
+def overcloud_ramdisk(basename):
+    return ('%s-initrd' % basename,
+            '.initrd')
+
+
+def overcloud_image(basename):
+    return (basename,
+            '.qcow2')
+
+
+def deploy_kernel():
+    return ('bm-deploy-kernel',
+            '.kernel')
+
+
+def deploy_ramdisk():
+    return ('bm-deploy-ramdisk',
+            '.initramfs')

tripleoclient/v1/overcloud_image.py

@@ -309,8 +309,8 @@ class UploadOvercloudImage(command.Command):
 
         # vmlinuz and initrd only need to be uploaded for a partition image
         if not parsed_args.whole_disk:
-            oc_vmlinuz_name = '%s-vmlinuz' % image_name
-            oc_vmlinuz_extension = '.vmlinuz'
+            (oc_vmlinuz_name,
+             oc_vmlinuz_extension) = plugin_utils.overcloud_kernel(image_name)
             oc_vmlinuz_file = os.path.join(parsed_args.image_path,
                                            image_name +
                                            oc_vmlinuz_extension)
@@ -325,8 +325,8 @@ class UploadOvercloudImage(command.Command):
                               parsed_args.image_path, oc_vmlinuz_file)
             ))
 
-            oc_initrd_name = '%s-initrd' % image_name
-            oc_initrd_extension = '.initrd'
+            (oc_initrd_name,
+             oc_initrd_extension) = plugin_utils.overcloud_ramdisk(image_name)
             oc_initrd_file = os.path.join(parsed_args.image_path,
                                           image_name +
                                           oc_initrd_extension)
@@ -341,8 +341,8 @@ class UploadOvercloudImage(command.Command):
                                parsed_args.image_path, oc_initrd_file)
             ))
 
-            oc_name = image_name
-            oc_extension = '.qcow2'
+            (oc_name,
+             oc_extension) = plugin_utils.overcloud_image(image_name)
             oc_file = os.path.join(parsed_args.image_path,
                                    image_name +
                                    oc_extension)
@@ -370,8 +370,8 @@ class UploadOvercloudImage(command.Command):
                                'image. You can keep it or fix it manually.')
 
         else:
-            oc_name = image_name
-            oc_extension = '.qcow2'
+            (oc_name,
+             oc_extension) = plugin_utils.overcloud_image(image_name)
             oc_file = os.path.join(parsed_args.image_path,
                                    image_name +
                                    oc_extension)
@@ -389,8 +389,8 @@ class UploadOvercloudImage(command.Command):
 
         self.log.debug("uploading bm images to glance")
 
-        deploy_kernel_name = 'bm-deploy-kernel'
-        deploy_kernel_extension = '.kernel'
+        (deploy_kernel_name,
+         deploy_kernel_extension) = plugin_utils.deploy_kernel()
         deploy_kernel_file = os.path.join(parsed_args.image_path,
                                           parsed_args.ipa_name +
                                           deploy_kernel_extension)
@@ -404,8 +404,8 @@ class UploadOvercloudImage(command.Command):
                     parsed_args.image_path,
                     deploy_kernel_file))
 
-        deploy_ramdisk_name = 'bm-deploy-ramdisk'
-        deploy_ramdisk_extension = '.initramfs'
+        (deploy_ramdisk_name,
+         deploy_ramdisk_extension) = plugin_utils.deploy_ramdisk()
         deploy_ramdisk_file = os.path.join(parsed_args.image_path,
                                            parsed_args.ipa_name +
                                            deploy_ramdisk_extension)