utils: Don't change the name of the image, breaks the get_ami.py layout

Signed-off-by: Sayan Chowdhury <[email protected]>

fedimg/services/ec2/ec2imgpublisher.py

@@ -30,6 +30,7 @@
 
 from fedimg.utils import external_run_command, get_item_from_regex
 from fedimg.utils import get_image_name_from_ami_name
+from fedimg.utils import get_image_name_from_ami_name_for_fedmsg
 from fedimg.services.ec2.ec2base import EC2Base
 
 
@@ -181,7 +182,7 @@ def publish_images(self, region_image_mapping=None):
                 fedimg.messenger.notify(
                     topic='image.publish',
                     msg=dict(
-                        image_name=image.name,
+                        image_name=get_image_name_from_ami_name_for_fedmsg(image.name),
                         image_url=self.image_url,
                         destination=self.region,
                         service=self.service,
@@ -197,7 +198,7 @@ def publish_images(self, region_image_mapping=None):
                 fedimg.messenger.notify(
                     topic='image.upload',
                     msg=dict(
-                        image_name=image.name,
+                        image_name=get_image_name_from_ami_name_for_fedmsg(image.name),
                         image_url=self.image_url,
                         destination=self.region,
                         service=self.service,
@@ -261,7 +262,7 @@ def copy_images_to_regions(self, image_id=None, base_region=None, regions=None):
                         fedimg.messenger.notify(
                             topic='image.copy',
                             msg=dict(
-                                image_name=copied_image.name,
+                                image_name=get_image_name_from_ami_name_for_fedmsg(copied_image.name),
                                 destination=self.region,
                                 service=self.service,
                                 compose_id=self.compose_id,

fedimg/services/ec2/ec2imguploader.py

@@ -27,6 +27,7 @@
 import fedimg.messenger
 
 from fedimg.utils import external_run_command, get_item_from_regex
+from fedimg.utils import get_image_name_from_ami_name_for_fedmsg
 from fedimg.config import AWS_DELETE_RESOURCES, AWS_S3_BUCKET_NAME
 from fedimg.services.ec2.ec2base import EC2Base
 
@@ -216,7 +217,7 @@ def _register_image(self, snapshot):
                         topic='image.upload',
                         msg=dict(
                             image_url=self.image_url,
-                            image_name=self.image_name,
+                            image_name=get_image_name_from_ami_name_for_fedmsg(self.image_name),
                             destination=self.region,
                             service=self.service,
                             status='completed',

fedimg/services/ec2/ec2initiate.py

@@ -37,6 +37,7 @@
 from fedimg.services.ec2.ec2imgpublisher import EC2ImagePublisher
 from fedimg.utils import get_virt_types_from_url, get_source_from_image
 from fedimg.utils import get_image_name_from_image, get_file_arch
+from fedimg.utils import get_image_name_from_ami_name_for_fedmsg
 
 LOG = logging.getLogger(__name__)
 
@@ -141,7 +142,7 @@ def main(image_urls, access_id, secret_key, regions, volume_types=None,
                         topic='image.upload',
                         msg=dict(
                             image_url=image_url,
-                            image_name=image_name,
+                            image_name=get_image_name_from_ami_name_for_fedmsg(image_name),
                             destination=region,
                             service='EC2',
                             status='started',

fedimg/utils.py

@@ -164,3 +164,10 @@ def get_image_name_from_ami_name(image_name, region):
 
     return '-'.join(
         [x for x in [name_vt, region, volume_type, respin] if x])
+
+
+def get_image_name_from_ami_name_for_fedmsg(image_name):
+    name_vt_region, volume_type, respin = image_name.rsplit('-', 2)
+    image_name = name_vt_region.rsplit('-', 4)[:-4][0]
+
+    return image_name

tests/test_utils.py

@@ -343,3 +343,10 @@ def test_get_image_name_from_ami_name(self):
         )
 
         assert image_name == 'Fedora-Cloud-Base-26-20180329.0.x86_64-paravirtual-eu-west-1-gp2-0'
+
+    def test_get_image_name_from_ami_name_for_fedmsg(self):
+        image_name = fedimg.utils.get_image_name_from_ami_name_for_fedmsg(
+            'Fedora-Cloud-Base-26-20180329.0.x86_64-paravirtual-us-east-1-gp2-0',
+        )
+
+        assert image_name == 'Fedora-Cloud-Base-26-20180329.0.x86_64'