Commit e24f2c18 authored by aticig's avatar aticig Committed by aticig
Browse files

Adding PaaS Service Creation 



Adding paas_account parameter, making vim_account optional.
Correcting format errors in instance_topics.py and
refactoring _update_vnfrs method to make it testable.

Change-Id: Ib0e5cef22312bcdc1dfbf51cf2cbe1d37c7f4e66
Signed-off-by: aticig's avatarGulsum Atici <gulsum.atici@canonical.com>
parent 43eac1e0

osm_nbi/instance_topics.py

+502 −257

File changed.

Preview size limit exceeded, changes collapsed.

osm_nbi/osm_vnfm/vnf_instance_actions.py

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ class NewVnfLcmOp(BaseMethod): 
                "nsName": indata["vnfName"],

                "nsDescription": indata["vnfDescription"],

                "nsdId": self.__get_nsdid(session, indata["vnfInstanceId"]),

                "vimAccountId": indata["vimAccountId"],

                "vimAccountId": indata.get("vimAccountId"),

                "paasAccountId": indata.get("paasAccountId"),

                "nsr_id": indata["vnfInstanceId"],

                "lcmOperationType": indata["lcmOperationType"],

                "nsInstanceId": indata["vnfInstanceId"]

osm_nbi/validation.py

+5 −3
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ ns_instantiate = { 
        "nsName": name_schema,

        "nsDescription": {"oneOf": [description_schema, null_schema]},

        "nsdId": id_schema,

        "vimAccountId": id_schema,

        "vimAccountId": {"oneOf": [id_schema, null_schema]},

        "paasAccountId": {"oneOf": [id_schema, null_schema]},

        "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]},

        "placement-engine": string_schema,

        "placement-constraints": object_schema,
@@ -366,7 +367,8 @@ ns_instantiate = { 
                "type": "object",

                "properties": {

                    "member-vnf-index": name_schema,

                    "vimAccountId": id_schema,

                    "vimAccountId": {"oneOf": [id_schema, null_schema]},

                    "paasAccountId": {"oneOf": [id_schema, null_schema]},

                    "vdu": {

                        "type": "array",

                        "minItems": 1,
@@ -421,7 +423,7 @@ ns_instantiate = { 
            },

        },

    },

    "required": ["nsName", "nsdId", "vimAccountId"],

    "required": ["nsName", "nsdId"],

    "additionalProperties": False,

}