From e5c89bb4a753f030405b2094e29f69b52faac055 Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Mon, 11 Mar 2019 17:02:31 +0800
Subject: [PATCH] Merge the user given tags when update package

Change-Id: I1b4a556f619c346da49c0ddf5085b2aa12e7752e
---
 murano/api/v1/catalog.py                 |  6 ++-
 murano/tests/unit/api/v1/test_catalog.py | 49 ++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/murano/api/v1/catalog.py b/murano/api/v1/catalog.py
index 9549f4ae4..f9dc62907 100644
--- a/murano/api/v1/catalog.py
+++ b/murano/api/v1/catalog.py
@@ -262,7 +262,11 @@ class Controller(object):
                 # extend dictionary for update db
                 for k, v in PKG_PARAMS_MAP.items():
                     if hasattr(pkg_to_upload, k):
-                        package_meta[v] = getattr(pkg_to_upload, k)
+                        if k == "tags" and package_meta.get(k):
+                            package_meta[v] = list(set(
+                                package_meta[v] + getattr(pkg_to_upload, k)))
+                        else:
+                            package_meta[v] = getattr(pkg_to_upload, k)
                 if len(package_meta['name']) > 80:
                     msg = _('Package name should be 80 characters maximum')
                     LOG.error(msg)
diff --git a/murano/tests/unit/api/v1/test_catalog.py b/murano/tests/unit/api/v1/test_catalog.py
index feabd940d..cad5cb1e3 100644
--- a/murano/tests/unit/api/v1/test_catalog.py
+++ b/murano/tests/unit/api/v1/test_catalog.py
@@ -1183,6 +1183,55 @@ This is a fake zip archive
             res = req.get_response(self.api)
             self.assertEqual(200, res.status_code)
 
+    def test_upload_pkg_with_tag(self):
+        """Check upload package with tags successfully"""
+
+        self._set_policy_rules({'upload_package': '@'})
+        self.expect_policy_check('upload_package')
+        file_obj_str = cStringIO("This is some dummy data")
+        file_obj = mock.MagicMock(cgi.FieldStorage)
+        file_obj.file = file_obj_str
+        package_from_dir, _ = self._test_package()
+
+        body_fmt = '''\
+
+--BOUNDARY
+Content-Disposition: form-data; name="__metadata__"
+
+{0}
+--BOUNDARY
+Content-Disposition: form-data; name="ziparchive"; filename="file.zip"
+
+This is a fake zip archive
+--BOUNDARY--'''
+
+        def format_body(content):
+            content = jsonutils.dumps(content)
+            body = body_fmt.format(content)
+            if six.PY3:
+                body = body.encode('utf-8')
+            return body
+
+        with mock.patch('murano.packages.load_utils.load_from_file') as lff:
+            ctxmgr = mock.Mock()
+            ctxmgr.__enter__ = mock.Mock(return_value=package_from_dir)
+            ctxmgr.__exit__ = mock.Mock(return_value=False)
+            lff.return_value = ctxmgr
+
+            # Uploading a package with foo_tag
+            req = self._post(
+                '/catalog/packages',
+                format_body({'tags': ['foo_tag']}),
+                content_type='multipart/form-data; ; boundary=BOUNDARY',
+            )
+            res = req.get_response(self.api)
+
+            processed_result = jsonutils.loads(res.body)
+            # check user set foo_tag in result
+            self.assertIn('foo_tag', processed_result["tags"])
+            # check tag Linux from package in result
+            self.assertIn('Linux', processed_result["tags"])
+
     def test_add_category(self):
         """Check that category added successfully"""