Enhancement for query 40/85940/19
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>
Sat, 20 Apr 2019 10:11:18 +0000 (15:41 +0530)
committerSeshu Kumar M <seshu.kumar.m@huawei.com>
Fri, 26 Apr 2019 06:17:58 +0000 (06:17 +0000)
commit9797ba0f3aa46ee9267f6e8de1d7f871464f4b99
tree7bd4b12d7391cbc58ba3698f75d1c1410f39b682
parent046eb620661451d3d62638d5253d3e112f565d1a
Enhancement for query

Enhancemenv for query to include group and vnfccustomization.

{
    "serviceResources": {
        "modelInfo": {
            "modelName": "NSService",
            "modelUuid": "0bad8c92-7d22-49f0-b092-b64e6ca564a7",
            "modelInvariantUuid": "69161960-515b-4bf3-91f1-313b813f5e1d",
            "modelVersion": "1.0"
        },
        "serviceType": "",
        "serviceRole": "",
        "environmentContext": "General_Revenue-Bearing",
        "resourceOrder": "NF",
        "workloadContext": "Production",
        "serviceVnfs": [
            {
                "modelInfo": {
                    "modelName": "",
                    "modelUuid": "123",
                    "modelInvariantUuid": "",
                    "modelVersion": "",
                    "modelCustomizationUuid": "1234",
                    "modelInstanceName": "test"
                },
                "toscaNodeType": "",
                "nfFunction": "",
                "nfType": "",
                "nfRole": "",
                "nfNamingCode": "",
                "multiStageDesign": "",
                "resourceInput": "",
                "vfModules": [],
                "groups": [
                    {
                        "modelInfo": {
                            "modelName": "test",
                            "modelUuid": "11",
                            "modelInvariantUuid": "11",
                            "modelVersion": "2"
                        },
                        "vnfcs": [
                            {
                                "modelInfo": {
                                    "modelName": "xfs",
                                    "modelUuid": "22",
                                    "modelInvariantUuid": "2222",
                                    "modelVersion": "22222",
                                    "modelCustomizationUuid": "2222"
                                }
                            }
                        ]
                    }
                ]
            }
        ],
        "serviceNetworks": [],
        "serviceAllottedResources": []
    }
}

Issue-ID: SO-1393
Change-Id: Iee7f79337f73276f857d6d42b5b2416e4e8f4536
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
12 files changed:
adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryGroups.java [new file with mode: 0644]
adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryVnfcs.java [new file with mode: 0644]
adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V5.12__Add_Relation_VnfcCustomization.sql [new file with mode: 0644]
adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/QueryGroupsTest.java [new file with mode: 0644]
adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/QueryVnfcsTest.java [new file with mode: 0644]
adapters/mso-openstack-adapters/src/test/resources/schema.sql
asdc-controller/src/test/resources/schema.sql
mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql
mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcCustomization.java
mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcInstanceGroupCustomization.java
mso-catalog-db/src/test/resources/schema.sql