summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2019-03-19 15:10:40 +0800
committeryangyan <yangyanyj@chinamobile.com>2019-03-19 15:10:52 +0800
commitc14f1ae7b1610be369a14f9577f9d4274d06357f (patch)
treec5c12f4b64758cfa2c0d65b8d628c978afb32f17
parent83959ef5953398a34395b938e6952542a656b7ec (diff)
fix the test bug of vnflcm
Change-Id: Ie24ad491dd28636e9aba1426097f50442e2a755d Issue-ID: VFC-1305 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rw-r--r--lcm/lcm/nf/serializers/_links.py22
-rw-r--r--lcm/lcm/nf/serializers/lccn_subscription.py12
-rw-r--r--lcm/lcm/nf/serializers/link.py2
-rw-r--r--lcm/lcm/nf/serializers/notification_types.py8
-rw-r--r--lcm/lcm/nf/serializers/vnf_lcm_op_occ.py4
5 files changed, 24 insertions, 24 deletions
diff --git a/lcm/lcm/nf/serializers/_links.py b/lcm/lcm/nf/serializers/_links.py
index a8c0261e..71828b09 100644
--- a/lcm/lcm/nf/serializers/_links.py
+++ b/lcm/lcm/nf/serializers/_links.py
@@ -14,47 +14,47 @@
from rest_framework import serializers
-from link import LinkSerializer
+from link import linkSerializer
class _LinksSerializer(serializers.Serializer):
- href = LinkSerializer(
+ href = linkSerializer(
help_text="URI of this resource.",
required=True,
allow_null=False)
- indicators = LinkSerializer(
+ indicators = linkSerializer(
help_text="Indicators related to this VNF instance.",
required=False,
allow_null=True)
- instantiate = LinkSerializer(
+ instantiate = linkSerializer(
help_text="Link to the instantiate task resource.",
required=False,
allow_null=True)
- termiante = LinkSerializer(
+ termiante = linkSerializer(
help_text="Link to the terminate task resource.",
required=False,
allow_null=True)
- scale = LinkSerializer(
+ scale = linkSerializer(
help_text="Link to the scale task resource.",
required=False,
allow_null=True)
- scaleToLevel = LinkSerializer(
+ scaleToLevel = linkSerializer(
help_text="Link to the scale_to_level task resource.",
required=False,
allow_null=True)
- changeFlavour = LinkSerializer(
+ changeFlavour = linkSerializer(
help_text="Link to the change_flavour task resource.",
required=False,
allow_null=True)
- heal = LinkSerializer(
+ heal = linkSerializer(
help_text="Link to the heal task resource.",
required=False,
allow_null=True)
- operate = LinkSerializer(
+ operate = linkSerializer(
help_text="Link to the operate task resource.",
required=False,
allow_null=True)
- changeExtConn = LinkSerializer(
+ changeExtConn = linkSerializer(
help_text="Link to the change_ext_conn task resource.",
required=False,
allow_null=True)
diff --git a/lcm/lcm/nf/serializers/lccn_subscription.py b/lcm/lcm/nf/serializers/lccn_subscription.py
index 73d5ea75..e29c6d10 100644
--- a/lcm/lcm/nf/serializers/lccn_subscription.py
+++ b/lcm/lcm/nf/serializers/lccn_subscription.py
@@ -14,15 +14,15 @@
from rest_framework import serializers
-from link import LinkSerializer
+from link import linkSerializer
from lccn_filter_data import LifeCycleChangeNotificationsFilter
-# class LinkSerializer(serializers.Serializer):
-# self = LinkSerializer(
-# help_text="URI of this resource.",
-# required=True,
-# allow_null=False)
+class LinkSerializer(serializers.Serializer):
+ self = linkSerializer(
+ help_text="URI of this resource.",
+ required=True,
+ allow_null=False)
class LccnSubscriptionSerializer(serializers.Serializer):
diff --git a/lcm/lcm/nf/serializers/link.py b/lcm/lcm/nf/serializers/link.py
index 489cbf37..cac65c1b 100644
--- a/lcm/lcm/nf/serializers/link.py
+++ b/lcm/lcm/nf/serializers/link.py
@@ -12,7 +12,7 @@
from rest_framework import serializers
-class LinkSerializer(serializers.Serializer):
+class linkSerializer(serializers.Serializer):
href = serializers.CharField(
help_text="URI of the referenced resource.",
required=True,
diff --git a/lcm/lcm/nf/serializers/notification_types.py b/lcm/lcm/nf/serializers/notification_types.py
index 1472e292..d6755881 100644
--- a/lcm/lcm/nf/serializers/notification_types.py
+++ b/lcm/lcm/nf/serializers/notification_types.py
@@ -18,23 +18,23 @@ from affected_vnfcs import AffectedVnfcsSerializer
from affected_vls import AffectedVLsSerializer
from affected_storages import AffectedStoragesSerializer
from lcm.nf.const import LCM_OPERATION_TYPES, LCM_OPERATION_STATE_TYPES
-from link import LinkSerializer
+from link import linkSerializer
from response import ProblemDetailsSerializer
from ext_virtual_link_info import ExtVirtualLinkInfoSerializer
from vnf_info_modifications import VnfInfoModificationsSerializer
class LccnLinksSerializer(serializers.Serializer):
- vnfInstance = LinkSerializer(
+ vnfInstance = linkSerializer(
help_text="Link to the resource representing the VNF instance to "
"which the notified change applies.",
required=True,
allow_null=False)
- subscription = LinkSerializer(
+ subscription = linkSerializer(
help_text="Link to the related subscription.",
required=True,
allow_null=False)
- vnfLcmOpOcc = LinkSerializer(
+ vnfLcmOpOcc = linkSerializer(
help_text="Link to the VNF lifecycle management operation"
"occurrence that this notification is related to. Shall be"
"present if there is a related lifecycle operation occurance.",
diff --git a/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py b/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py
index a2b50196..267f5f8d 100644
--- a/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py
+++ b/lcm/lcm/nf/serializers/vnf_lcm_op_occ.py
@@ -18,7 +18,7 @@ from rest_framework import serializers
from affected_vnfcs import AffectedVnfcsSerializer
from affected_vls import AffectedVLsSerializer
from affected_storages import AffectedStoragesSerializer
-from link import LinkSerializer
+from link import linkSerializer
from response import ProblemDetailsSerializer
from ext_virtual_link_info import ExtVirtualLinkInfoSerializer
from vnf_info_modifications import VnfInfoModificationsSerializer
@@ -69,7 +69,7 @@ class ResourceChangesSerializer(serializers.Serializer):
class LcmOpLinkSerializer(serializers.Serializer):
- self = LinkSerializer(
+ self = linkSerializer(
help_text="URI of this resource.",
required=True,
allow_null=False)