Merge branch 'dev_search_upgrade' into dev

Author: pobu168

artifacts-corepy/artifacts_corepy/apps/package/apiv2.py

@@ -2,6 +2,7 @@
 
 from __future__ import absolute_import
 
+import copy
 import datetime
 import hashlib
 import fnmatch
@@ -189,6 +190,13 @@ def list_by_post(self, query):
         pass
 
 
+class User(WeCubeResource):
+    def list(self, params):
+        api_client = self.get_cmdb_client()
+        url = self.server + '/platform/v1/users/retrieve'
+        resp_json = api_client.get(url, {}, check_resp=False)
+        return resp_json.get('data', [])
+    
 class ProcessDef(WeCubeResource):
     def list(self, params):
         params['plugin'] = 'artifacts'
@@ -375,6 +383,24 @@ def list_by_post(self, query, unit_design_id):
                 i[field] = self.build_file_object(i.get(field, None))
         return resp_json['data']
 
+    def get_package_statistics(self, post_data, unit_design_id):
+        cmdb_client = self.get_cmdb_client()
+        result = {}
+        post_data = post_data or {}
+        query = post_data
+        query.setdefault('dialect', {"queryMode": "new"})
+        query.setdefault('filters', [])
+        query.setdefault('paging', True)
+        query.setdefault('pageable', {'pageSize':1, 'startIndex': 1})
+        self.set_package_query_fields(query)
+        query['filters'].append({"name": "unit_design", "operator": "eq", "value": unit_design_id})
+        for t in  [constant.PackageType.app, constant.PackageType.db, constant.PackageType.mixed, constant.PackageType.image, constant.PackageType.rule]:
+            query_tmp = copy.deepcopy(query)
+            query_tmp['filters'].append({"name": field_pkg_package_type_name, "operator": "eq", "value": t})
+            resp_json = cmdb_client.retrieve(CONF.wecube.wecmdb.citypes.deploy_package, query_tmp)
+            result[t] = resp_json['data']['pageInfo']['totalRows']
+        return result
+
     def build_file_object(self, filenames, spliter=None):
         if spliter is None:
             spliter = r'[|,]' 
@@ -773,7 +799,9 @@ def _pack_compose_package(self, pack_filepath, deploy_package_id:str):
                 tar.add(package_path_db_diffconfigs, arcname=os.path.basename(package_path_db_diffconfigs))
         return output_filename
 
-    def upload(self, filename, filetype, fileobj, baseline_package, unit_design_id):
+    def upload(self, filename, filetype, fileobj, baseline_package, package_type, unit_design_id):
+        if not package_type:
+            package_type = constant.PackageType.default
         if not is_upload_local_enabled():
             raise exceptions.PluginError(message=_("Package uploading is disabled!"))
         if self._is_compose_package(filename):
@@ -803,7 +831,8 @@ def upload(self, filename, filetype, fileobj, baseline_package, unit_design_id):
             field_pkg_is_decompression_name: field_pkg_is_decompression_default_value,
             'upload_user': scoped_globals.GLOBALS.request.auth_user,
             'upload_time': datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-            'unit_design': unit_design_id
+            'unit_design': unit_design_id,
+            field_pkg_package_type_name: package_type
         }]
         exist_package = self._get_deploy_package_by_name_unit(filename,unit_design_id)
         if exist_package is None:
@@ -812,13 +841,17 @@ def upload(self, filename, filetype, fileobj, baseline_package, unit_design_id):
             package_rows[0]['guid'] = exist_package['guid']
             package_result = self.pure_update(package_rows)
         new_package_guid = package_result['data'][0]['guid']
-        new_deploy_attrs = self._analyze_package_attrs(new_package_guid, baseline_package, {})
+        new_deploy_attrs = self._analyze_package_attrs(new_package_guid, baseline_package, {
+            field_pkg_package_type_name: package_type
+        })
         # update 属性
         new_deploy_attrs['guid'] = new_package_guid
         self.pure_update([new_deploy_attrs])
         return [self._get_deploy_package_by_id(new_package_guid)]
 
-    def upload_from_nexus(self, download_url, baseline_package, unit_design_id):
+    def upload_from_nexus(self, download_url, baseline_package, package_type, unit_design_id):
+        if not package_type:
+            package_type = constant.PackageType.default
         if not is_upload_nexus_enabled():
             raise exceptions.PluginError(message=_("Package uploading is disabled!"))
         url_info = self.download_url_parse(download_url)
@@ -876,7 +909,8 @@ def upload_from_nexus(self, download_url, baseline_package, unit_design_id):
                 field_pkg_is_decompression_name: field_pkg_is_decompression_default_value,
                 'upload_user': scoped_globals.GLOBALS.request.auth_user,
                 'upload_time': datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-                'unit_design': unit_design_id
+                'unit_design': unit_design_id,
+                field_pkg_package_type_name:package_type
             }]
             exist_package = self._get_deploy_package_by_name_unit(url_info['filename'],unit_design_id)
             if exist_package is None:
@@ -885,7 +919,9 @@ def upload_from_nexus(self, download_url, baseline_package, unit_design_id):
                 package_rows[0]['guid'] = exist_package['guid']
                 package_result = self.pure_update(package_rows)
             new_package_guid = package_result['data'][0]['guid']
-            new_deploy_attrs = self._analyze_package_attrs(new_package_guid, baseline_package, {})
+            new_deploy_attrs = self._analyze_package_attrs(new_package_guid, baseline_package, {
+                field_pkg_package_type_name: package_type
+            })
             # update 属性
             new_deploy_attrs['guid'] = new_package_guid
             self.pure_update([new_deploy_attrs])
@@ -927,7 +963,8 @@ def upload_from_nexus(self, download_url, baseline_package, unit_design_id):
                         'upload_time':
                         datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
                         'unit_design':
-                        unit_design_id
+                        unit_design_id,
+                        field_pkg_package_type_name:package_type
                     }]
                     exist_package = self._get_deploy_package_by_name_unit(filename,unit_design_id)
                     if exist_package is None:
@@ -936,7 +973,9 @@ def upload_from_nexus(self, download_url, baseline_package, unit_design_id):
                         package_rows[0]['guid'] = exist_package['guid']
                         package_result = self.pure_update(package_rows)
                     new_package_guid = package_result['data'][0]['guid']
-                    new_deploy_attrs = self._analyze_package_attrs(new_package_guid, baseline_package, {})
+                    new_deploy_attrs = self._analyze_package_attrs(new_package_guid, baseline_package, {
+                        field_pkg_package_type_name: package_type
+                    })
                     # update 属性
                     new_deploy_attrs['guid'] = new_package_guid
                     self.pure_update([new_deploy_attrs])
@@ -958,6 +997,11 @@ def _pop_none(d, k):
                                  rule='1, 36',
                                  rule_type='length',
                                  nullable=False),
+            crud.ColumnValidator('packageType',
+                                 validate_on=['update:O'],
+                                 rule='1, 36',
+                                 rule_type='length',
+                                 nullable=True),
         ]
         clean_data = crud.ColumnValidator.get_clean_data(validates, data, 'update')
         baseline_package_id = clean_data.get('baselinePackage')
@@ -966,7 +1010,7 @@ def _pop_none(d, k):
         url = CONF.wecube.nexus.server.rstrip(
             '/') + '/repository/' + CONF.wecube.nexus.repository + '/' + clean_data['nexusUrl'].lstrip('/')
         unit_design_id = baseline_package['unit_design']['guid']
-        new_pakcage = self.upload_from_nexus(url, baseline_package_id, unit_design_id)[0]
+        new_pakcage = self.upload_from_nexus(url, baseline_package_id, clean_data.get('packageType'), unit_design_id)[0]
         return {'guid': new_pakcage['guid']}
 
     def upload_and_create2(self, data):
@@ -1009,6 +1053,10 @@ def _pop_none(d, k):
                                  rule=validator.LengthValidator(1, 255),
                                  validate_on=['check:M'],
                                  nullable=False),
+            crud.ColumnValidator(field='package_type',
+                                 rule=validator.LengthValidator(1, 255),
+                                 validate_on=['check:O'],
+                                 nullable=True),
         ]
 
         result = {'resultCode': '0', 'resultMessage': 'success', 'results': {'outputs': []}}
@@ -1046,7 +1094,9 @@ def _pop_none(d, k):
                     unit_design = resp_json['data']['contents'][0]
                     if clean_data['package_guid']:
                         # 有package_guid，则更新
-                        new_deploy_attrs = self._analyze_package_attrs(clean_data['package_guid'], clean_data['baseline_package_guid'], {})
+                        new_deploy_attrs = self._analyze_package_attrs(clean_data['package_guid'], clean_data['baseline_package_guid'], {
+                            field_pkg_package_type_name: clean_data.get('package_type')
+                        })
                         # update 属性
                         new_deploy_attrs['guid'] = clean_data['package_guid']
                         self.pure_update([new_deploy_attrs])
@@ -1059,7 +1109,7 @@ def _pop_none(d, k):
                             r_artifact_path = group
                         download_url = CONF.wecube.nexus.server.rstrip(
                             '/') + '/repository/' + CONF.wecube.nexus.repository + r_artifact_path + clean_data['package_name']
-                        self.upload_from_nexus(download_url, clean_data['baseline_package_guid'], clean_data['unit_design'])
+                        self.upload_from_nexus(download_url, clean_data['baseline_package_guid'], clean_data.get('package_type'), clean_data['unit_design'])
                     result['results']['outputs'].append(single_result)
                 except Exception as e:
                     single_result['errorCode'] = '1'
@@ -2555,3 +2605,12 @@ def list_by_post(self, query):
             result.append({"id": item, "displayName": item, "unit_design_id": unit_design_id})
 
         return result
+
+class CiData(WeCubeResource):
+    def list_by_post(self, query, citype):
+        cmdb_client = self.get_cmdb_client()
+        query.setdefault('dialect', {"queryMode": "new"})
+        query.setdefault('filters', [])
+        query.setdefault('paging', False)
+        resp_json = cmdb_client.retrieve(citype, query)
+        return resp_json['data']

artifacts-corepy/artifacts_corepy/apps/package/controller.py

@@ -15,6 +15,7 @@
 from artifacts_corepy.common.controller import Collection, Item, POSTCollection
 from artifacts_corepy.common import exceptions
 from artifacts_corepy.apps.package import apiv2 as package_api
+from artifacts_corepy.common import constant
 
 CONF = config.CONF
 
@@ -53,6 +54,15 @@ class CollectionProcessDef(Collection):
     name = 'artifacts.process.defs'
     resource = package_api.ProcessDef
 
+class CollectionUser(Collection):
+    allow_methods = ('GET', )
+    name = 'artifacts.users.list'
+    resource = package_api.User
+    
+class CollectionCiData(POSTCollection):
+    allow_methods = ('POST',)
+    name = 'artifacts.diffconfigs'
+    resource = package_api.CiData
 
 class CollectionSystemDesign(Collection):
     allow_methods = ('GET', )
@@ -96,6 +106,14 @@ class CollectionUnitDesignPackages(POSTCollection):
     resource = package_api.UnitDesignPackages
 
 
+class CollectionPackageStatistics(POSTCollection):
+    allow_methods = ('POST', )
+    name = 'artifacts.packages.statistics'
+    resource = package_api.UnitDesignPackages
+    
+    def list(self, req, criteria, **kwargs):
+        return self.make_resource(req).get_package_statistics(req.json, **kwargs)
+
 class CollectionUnitDesignNexusPackages(POSTCollection):
     allow_methods = ('POST', )
     name = 'artifacts.unit-design.nexus.packages'
@@ -114,18 +132,23 @@ class CollectionUnitDesignNexusPackageUpload(object):
     def on_post(self, req, resp, **kwargs):
         download_url = req.params.get('downloadUrl', None)
         baseline_package = req.params.get('baseline_package', None)
+        package_type = req.params.get('package_type', None)
+        if not package_type:
+            raise exceptions.ValidationError(message=_('missing query param: package_type'))
+        elif package_type not in [constant.PackageType.app, constant.PackageType.db, constant.PackageType.mixed, constant.PackageType.image, constant.PackageType.rule]:
+            raise exceptions.ValidationError(message=_('invalid package_type param value: %s') % package_type)
         if not download_url:
-            raise exceptions.ValidationError(message=_('missing query: downloadUrl'))
-        form = cgi.FieldStorage(fp=req.stream, environ=req.env)
+            raise exceptions.ValidationError(message=_('missing query param: downloadUrl'))
+        # form = cgi.FieldStorage(fp=req.stream, environ=req.env)
         resp.json = {
             'code': 200,
             'status': 'OK',
-            'data': self.upload(req, download_url, baseline_package, **kwargs),
+            'data': self.upload(req, download_url, baseline_package, package_type, **kwargs),
             'message': 'success'
         }
 
-    def upload(self, req, download_url, baseline_package, **kwargs):
-        return self.resource().upload_from_nexus(download_url, baseline_package, **kwargs)
+    def upload(self, req, download_url, baseline_package, package_type, **kwargs):
+        return self.resource().upload_from_nexus(download_url, baseline_package, package_type, **kwargs)
 
 
 class CollectionUnitDesignPackageUpload(object):
@@ -135,17 +158,24 @@ class CollectionUnitDesignPackageUpload(object):
     def on_post(self, req, resp, **kwargs):
         form = cgi.FieldStorage(fp=req.stream, environ=req.env)
         baseline_package = None
+        package_type = None
         if 'baseline_package' in form:
             baseline_package = form.getvalue('baseline_package', None)
+        if 'package_type' in form:
+            package_type = form.getvalue('package_type', None)
+        if not package_type:
+            raise exceptions.ValidationError(message=_('missing form param: package_type'))
+        elif package_type not in [constant.PackageType.app, constant.PackageType.db, constant.PackageType.mixed, constant.PackageType.image, constant.PackageType.rule]:
+            raise exceptions.ValidationError(message=_('invalid package_type param value: %s') % package_type)
         resp.json = {
             'code': 200,
             'status': 'OK',
-            'data': self.upload(req, form['file'].filename, form['file'].type, form['file'].file, baseline_package, **kwargs),
+            'data': self.upload(req, form['file'].filename, form['file'].type, form['file'].file, baseline_package, package_type, **kwargs),
             'message': 'success'
         }
 
-    def upload(self, req, filename, filetype, fileobj, baseline_package, **kwargs):
-        return self.resource().upload(filename, filetype, fileobj, baseline_package, **kwargs)
+    def upload(self, req, filename, filetype, fileobj, baseline_package, package_type, **kwargs):
+        return self.resource().upload(filename, filetype, fileobj, baseline_package, package_type, **kwargs)
 
 
 class ItemPackage(Item):

artifacts-corepy/artifacts_corepy/apps/package/route.py

@@ -66,6 +66,8 @@ def __call__(self, req, resp, package_name, entity_name, action_name):
 def add_routes(api):
     # process
     api.add_route('/artifacts/process/definitions', controller.CollectionProcessDef())
+    api.add_route('/artifacts/users', controller.CollectionUser())
+    api.add_route('/artifacts/cidata/{citype}/query', controller.CollectionCiData())
     # cmdb api forward
     api.add_route('/artifacts/system-design-versions', controller.CollectionSystemDesign())
     api.add_route('/artifacts/system-design-versions/{rid}', controller.ItemSystemDesign())
@@ -76,6 +78,7 @@ def add_routes(api):
     api.add_route('/artifacts/enum/system/codes/{cat_id}', controller.ItemEnumCodes())
     api.add_route('/artifacts/ci-types/{ci_type_id}/operations', controller.ItemCITypeOperations())
     api.add_route('/artifacts/unit-designs/{unit_design_id}/packages/query', controller.CollectionUnitDesignPackages())
+    api.add_route('/artifacts/unit-designs/{unit_design_id}/packages/statistics', controller.CollectionPackageStatistics())
     api.add_route('/artifacts/ci-types/{ci_type_id}/references/by', controller.ItemCiReferences())
     api.add_route('/artifacts/ci-types/{ci_type_id}/attributes', controller.ItemCiAttributes())
     api.add_route('/artifacts/ci-types/{ci_type_id}/ci-data/batch-delete', controller.CiDelete())

artifacts-corepy/artifacts_corepy/common/constant.py

@@ -8,6 +8,7 @@ class PackageType(object):
     db = 'DB'
     mixed = 'APP&DB'
     image = 'IMAGE'
+    rule = 'RULE'
     default = 'APP&DB'
 
 

artifacts-corepy/etc/artifacts_corepy.conf

@@ -161,6 +161,7 @@
         "artifacts.ci-types": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
         "artifacts.enum-codes": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
         "artifacts.unit-design.packages": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
+        "artifacts.packages.statistics": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
         "artifacts.unit-design.nexus.packages": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
         "artifacts.unit-design.nexus.package.upload": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
         "artifacts.unit-design.package.upload": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
@@ -180,7 +181,8 @@
         "artifacts.pushcomposepackage": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
         "artifacts.systemconfig": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
         "artifacts.unit-design.nexus.path": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
-        "artifacts.process.defs": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"]
+        "artifacts.process.defs": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"],
+        "artifacts.users.list": ["SUB_SYSTEM", "IMPLEMENTATION_ARTIFACT_MANAGEMENT"]
     },
     "plugin_permissions": [
         "artifacts.plugins.fromimage"

artifacts-ui/src/api/server.js

@@ -46,7 +46,7 @@ export const getSpecialConnector = () => req.get('/static-data/special-connector
 export const getVariableRootCiTypeId = () => req.get('/getVariableRootCiTypeId')
 export const getEntitiesByCiType = (packageName, ci, data) => req.post(`/platform/v1/packages/${packageName}/entities/${ci}/retrieve`, data)
 export const queryArtifactsList = (guid, data) => req.post(`/unit-designs/${guid}/packages/queryNexusDirectiry`, data)
-export const uploadArtifact = (guid, url, baselinePackage) => req.post(`/unit-designs/${guid}/packages/uploadNexusPackage?downloadUrl=${url}&&baseline_package=${baselinePackage}`)
+export const uploadArtifact = (guid, url, baselinePackage, packageType) => req.post(`/unit-designs/${guid}/packages/uploadNexusPackage?downloadUrl=${url}&baseline_package=${encodeURIComponent(baselinePackage)}&package_type=${encodeURIComponent(packageType)}`)
 
 export const uploadLocalArtifact = (guid, formData) => req.post(`/unit-designs/${guid}/packages/upload`, formData)
 
@@ -60,3 +60,7 @@ export const getFilePath = guid => req.get(`/unit-designs/${guid}/packages/query
 export const sysConfig = () => req.get(`/sysconfig`)
 // 获取可用编排
 export const getFlowLists = guid => req.get(`/process/definitions?rootEntityGuid=${guid}`)
+// 获取各包类型下数据的数量
+export const getPkgTypeNum = unitDesignId => req.post(`/unit-designs/${unitDesignId}/packages/statistics`, {})
+
+export const getUserList = guid => req.get(`/users`)