Merge "fix nslcm middleware"

[vfc/nfvo/lcm.git] / lcm / ns / serializers / sol / ns_lcm_op_occ.py

diff --git a/lcm/ns/serializers/sol/ns_lcm_op_occ.py b/lcm/ns/serializers/sol/ns_lcm_op_occ.py
index b68486d..565b876 100644 (file)
--- a/lcm/ns/serializers/sol/ns_lcm_op_occ.py
+++ b/lcm/ns/serializers/sol/ns_lcm_op_occ.py
@@ -1,4 +1,5 @@
 # Copyright (c) 2019, CMCC Technologies Co., Ltd.
+# Copyright (c) 2019, ZTE
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,8 +23,8 @@ from lcm.ns.serializers.sol.affected_saps import AffectedSapsSerializer
 from lcm.ns.serializers.sol.affected_vls import AffectedVLsSerializer
 from lcm.ns.serializers.sol.affected_vnffgs import AffectedVnffgsSerializer
 from lcm.ns.serializers.sol.affected_vnfs import AffectedVnfsSerializer
-from lcm.ns.serializers.sol.link import linkSerializer
-from lcm.ns.serializers.sol.response import ProblemDetailsSerializer
+from lcm.ns.serializers.sol.pub_serializers import LinkSerializer
+from lcm.ns.serializers.sol.pub_serializers import ProblemDetailsSerializer
 
 
 class ResourceChangesSerializer(serializers.Serializer):
@@ -60,24 +61,24 @@ class ResourceChangesSerializer(serializers.Serializer):
 
 
 class LcmOpLinkSerializer(serializers.Serializer):
-    self = linkSerializer(
+    self = LinkSerializer(
         help_text="URI of this resource.",
         required=True,
         allow_null=False)
-    nsInstance = serializers.CharField(
+    nsInstance = LinkSerializer(
         help_text="Link to the NS instance that the operation applies to.",
         required=True)
-    cancel = serializers.CharField(
+    cancel = LinkSerializer(
         help_text="Link to the task resource that represents the 'cancel' operation for this LCM operation occurrence.",
         required=False)
-    retry = serializers.CharField(
+    retry = LinkSerializer(
         help_text="Link to the task resource that represents the 'retry' operation for this LCM operation occurrence, "
                   "if retrying is currently allowed",
         required=False)
-    rollback = serializers.CharField(
+    rollback = LinkSerializer(
         help_text="Link to the task resource that represents the 'cancel' operation for this LCM operation occurrence.",
         required=False)
-    fail = serializers.CharField(
+    fail = LinkSerializer(
         help_text="Link to the task resource that represents the 'fail' operation for this LCM operation occurrence.",
         required=False)
 
@@ -152,3 +153,7 @@ class NSLCMOpOccSerializer(serializers.Serializer):
     _links = LcmOpLinkSerializer(
         help_text="Links to resources related to this resource.",
         required=True)
+
+
+class NSLCMOpOccsSerializer(serializers.ListSerializer):
+    child = NSLCMOpOccSerializer()