From 8a8ba869c0554b0ce1396e69fdd7426362cc08c5 Mon Sep 17 00:00:00 2001
From: "ying.yunlong" <ying.yunlong@zte.com.cn>
Date: Wed, 28 Feb 2018 15:19:18 +0800
Subject: Add vfc-vnflcm vnfInstance schema

Change-Id: I88d71328cf9e38029d5b32479cc37efc6e2f7e47
Issue-ID: VFC-780
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---
 lcm/lcm/nf/serializers.py |  8 ++++----
 lcm/lcm/v2/serializers.py | 30 +++++++++++++++++-------------
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'lcm')

diff --git a/lcm/lcm/nf/serializers.py b/lcm/lcm/nf/serializers.py
index 66e20e62..d3aefebd 100644
--- a/lcm/lcm/nf/serializers.py
+++ b/lcm/lcm/nf/serializers.py
@@ -139,7 +139,7 @@ class InterfaceInfoSerializer(serializers.Serializer):
         allow_null=True)
     protocolType = serializers.ChoiceField(
         help_text="protocolType",
-        choices=['http', 'https'],
+        choices=["http", "https"],
         required=True)
 
 
@@ -218,7 +218,7 @@ class ExtVirtualLinkInfoSerializer(serializers.Serializer):
 class L3AddressDataSerializer(serializers.Serializer):
     iPAddressType = serializers.ChoiceField(
         help_text="iPAddressType",
-        choices=['IPv4', 'IPv6'],
+        choices=["IPv4", "IPv6"],
         required=True)
     iPAddress = serializers.CharField(
         help_text="iPAddress",
@@ -230,7 +230,7 @@ class L3AddressDataSerializer(serializers.Serializer):
 class NetworkAddressSerializer(serializers.Serializer):
     addressType = serializers.ChoiceField(
         help_text="addressType",
-        choices=['MAC', 'IP'],
+        choices=["MAC", "IP"],
         required=True)
     l2AddressData = serializers.CharField(
         help_text="l2AddressData",
@@ -283,7 +283,7 @@ class instantiatedVnfInfoSerializer(serializers.Serializer):
         allow_null=True)
     vnfState = serializers.ChoiceField(
         help_text="vnfState",
-        choices=['STARTED', 'STOPPED'],
+        choices=["STARTED", "STOPPED"],
         required=True,
         allow_null=True)
     scaleStatus = ScaleInfoSerializer(
diff --git a/lcm/lcm/v2/serializers.py b/lcm/lcm/v2/serializers.py
index 5c1453ee..b7415701 100644
--- a/lcm/lcm/v2/serializers.py
+++ b/lcm/lcm/v2/serializers.py
@@ -14,14 +14,6 @@
 from rest_framework import serializers
 
 
-class AccessInfoSerializer(serializers.Serializer):
-    pass
-
-
-class InterfaceInfoSerializer(serializers.Serializer):
-    pass
-
-
 class VimInfoSerializer(serializers.Serializer):
     id = serializers.CharField(
         help_text="The identifier of the VIM Connection. This identifier is managed by the NFVO.",
@@ -38,12 +30,19 @@ class VimInfoSerializer(serializers.Serializer):
         required=False,
         max_length=255,
         allow_null=True)
-    interfaceInfo = InterfaceInfoSerializer(
-        help_text="vimInfoId",
+    interfaceInfo = serializers.DictField(
+        help_text="Information about the interface or interfaces to the VIM",
+        child=serializers.CharField(allow_blank=True),
         required=False,
         allow_null=True)
-    accessInfo = AccessInfoSerializer(
-        help_text="accessInfo",
+    accessInfo = serializers.DictField(
+        help_text="Authentication credentials for accessing the VIM, and other access-related information",
+        child=serializers.CharField(allow_blank=True),
+        required=False,
+        allow_null=True)
+    extra = serializers.DictField(
+        help_text="VIM type specific additional information.",
+        child=serializers.CharField(allow_blank=True),
         required=False,
         allow_null=True)
 
@@ -94,10 +93,15 @@ class VnfInstanceSerializer(serializers.Serializer):
         allow_blank=True)
     vnfConfigurableProperties = serializers.DictField(
         help_text="Current values of the configurable properties of the VNF instance.",
-        child=serializers.CharField(help_text="Vnf Configurable Properties", allow_blank=True),
+        child=serializers.CharField(allow_blank=True),
         required=False,
         allow_null=True)
     vimConnectionInfo = VimInfoSerializer(
         help_text="vim",
         required=False,
         allow_null=True)
+    instantiationState = serializers.ChoiceField(
+        help_text="The instantiation state of the VNF.",
+        choices=["NOT_INSTANTIATED", "INSTANTIATED"],
+        required=False,
+        allow_null=True)
-- 
cgit 1.2.3-korg