diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2019-04-30 15:59:45 +0800 |
|---|---|---|
| committer | Yan Yang <yangyanyj@chinamobile.com> | 2019-04-30 08:25:47 +0000 |
| commit | 52a969dcc2a935930a559b1780d7c95e1cc45d73 (patch) | |
| tree | b95f60a4c719a0a24b5343f09fe17cb6fe060666 /genericparser/packages/biz | |
| parent | 63c392e9cca3c6654e8383f49e5136fa86d1c72a (diff) | |
code refactor for genericparser1.0.0
Change-Id: I68a128944cde015d767576fc4e159d67db2d6b5d
Issue-ID: VFC-1372
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'genericparser/packages/biz')
| -rw-r--r-- | genericparser/packages/biz/common.py | 6 | ||||
| -rw-r--r-- | genericparser/packages/biz/pnf_descriptor.py | 13 | ||||
| -rw-r--r-- | genericparser/packages/biz/vnf_pkg_subscription.py | 17 |
3 files changed, 22 insertions, 14 deletions
diff --git a/genericparser/packages/biz/common.py b/genericparser/packages/biz/common.py index be5627e..9b72b63 100644 --- a/genericparser/packages/biz/common.py +++ b/genericparser/packages/biz/common.py @@ -45,7 +45,7 @@ def read(file_path, start, end): def parse_file_range(file_path, file_range): start, end = 0, os.path.getsize(file_path) if file_range: - [start, end] = file_range.split('-') - start, end = start.strip(), end.strip() - start, end = int(start), int(end) + [start, range_end] = file_range.split('-') + range_end = range_end.strip() if range_end.strip() else end + start, end = int(start.strip()), int(range_end) return start, end diff --git a/genericparser/packages/biz/pnf_descriptor.py b/genericparser/packages/biz/pnf_descriptor.py index ae635ff..d29a2ad 100644 --- a/genericparser/packages/biz/pnf_descriptor.py +++ b/genericparser/packages/biz/pnf_descriptor.py @@ -53,7 +53,8 @@ class PnfDescriptor(object): logger.info('A PNFD(%s) has been created.' % data['id']) return data - def query_multiple(self, pnfdId=None): + def query_multiple(self, request): + pnfdId = request.query_params.get('pnfdId') if pnfdId: pnf_pkgs = PnfPackageModel.objects.filter(pnfdId=pnfdId) else: @@ -140,10 +141,10 @@ class PnfDescriptor(object): pnfdName = "" if pnfd.get("pnf", "") != "": if pnfd["pnf"].get("properties", "") != "": - pnfd_id = pnfd["pnf"].get("properties", "").get("descriptor_id", "") - pnfdVersion = pnfd["pnf"].get("properties", "").get("version", "") - pnfdProvider = pnfd["pnf"].get("properties", "").get("provider", "") - pnfdName = pnfd["pnf"].get("properties", "").get("name", "") + pnfd_id = pnfd["pnf"].get("properties", {}).get("descriptor_id", "") + pnfdVersion = pnfd["pnf"].get("properties", {}).get("version", "") + pnfdProvider = pnfd["pnf"].get("properties", {}).get("provider", "") + pnfdName = pnfd["pnf"].get("properties", {}).get("name", "") if pnfd_id == "": pnfd_id = pnfd["metadata"].get("descriptor_id", "") if pnfd_id == "": @@ -212,7 +213,7 @@ class PnfDescriptor(object): pnf_pkg.update(onboardingState=PKG_STATUS.CREATED) def parse_pnfd(self, csar_id, inputs): - ret = None + try: pnf_pkg = PnfPackageModel.objects.filter(pnfPackageId=csar_id) if not pnf_pkg: diff --git a/genericparser/packages/biz/vnf_pkg_subscription.py b/genericparser/packages/biz/vnf_pkg_subscription.py index 349db08..29f202f 100644 --- a/genericparser/packages/biz/vnf_pkg_subscription.py +++ b/genericparser/packages/biz/vnf_pkg_subscription.py @@ -65,11 +65,16 @@ class CreateSubscription(object): try: response = requests.get(self.callback_uri, timeout=2) if response.status_code != status.HTTP_204_NO_CONTENT: - raise VnfPkgSubscriptionException("callbackUri %s returns %s status " - "code." % (self.callback_uri, response.status_code)) + raise VnfPkgSubscriptionException( + "callbackUri %s returns %s status code." % ( + self.callback_uri, + response.status_code + ) + ) except Exception: - raise VnfPkgSubscriptionException("callbackUri %s didn't return 204 status" - "code." % self.callback_uri) + raise VnfPkgSubscriptionException( + "callbackUri %s didn't return 204 status code." % self.callback_uri + ) def do_biz(self): self.subscription_id = str(uuid.uuid4()) @@ -77,7 +82,9 @@ class CreateSubscription(object): self.check_valid_auth_info() self.check_valid() self.save_db() - subscription = VnfPkgSubscriptionModel.objects.get(subscription_id=self.subscription_id) + subscription = VnfPkgSubscriptionModel.objects.get( + subscription_id=self.subscription_id + ) if subscription: return subscription.toDict() |