Casablana bugfixes

updated mock in unassignnetworkbbtest instead of base
added mock to extract pojos method in unassignnetwork
Return gBuildingBlockExecution from calls to VnfAdapter subprocess
Correct JUnit data to expect modelInfoVfModule
Enable Spring Security for logging of unauthorized/bad credentials
errors
Fix handling of a case of no VF Modules in a VNF resource.
fix populating lookupKeyMap with resource ids
removed unnecessary test resources

Issue-ID: SO-848
Change-Id: Id89f075dcac4042bf8fb1e207e66d289d079171f
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 0 insertions, 217 deletions

diff --git a/asdc-controller/src/test/resources/resource-examples/multipleModules/testStructure.json b/asdc-controller/src/test/resources/resource-examples/multipleModules/testStructure.json
deleted file mode 100644
index 0dd1193e67..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/multipleModules/testStructure.json
+++ /dev/null
@@ -1,217 +0,0 @@
-{
-    "distributionID": "a2872f55-8628-4486-8548-7b132c9a47db",
-    "serviceName": "Vf zrdm5bpxmc02092017-Service",
-    "serviceVersion": "1.0",
-    "serviceUUID": "bad955c3-29b2-4a27-932e-28e942cc6480",
-    "serviceInvariantUUID": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b",
-    "serviceDescription": "Demo",
-    "serviceArtifacts": [
-        {
-            "artifactName": "service-VfZrdm5bpxmc02092017Service-csar.csar",
-            "artifactVersion": "1",
-            "artifactType": "TOSCA_CSAR",
-            "artifactDescription": "TOSCA definition package of the asset",
-            "artifactTimeout": "0",
-            "artifactURL": "service-VfZrdm5bpxmc02092017Service-csar.csar",
-            "artifactUUID": "396cfd49-0f4b-4fec-9f33-0fd7e90d5a22",
-            "artifactChecksum": "MWQ3Y2FmMWExNDQyYWI2N2YwNjEwZGUzN2IzMzI3NjE="
-        }
-    ],
-    "resources": [
-        {
-            "resourceInstanceName": "Vf zrdm5bpxmc02092017-VF 0",
-            "resourceCustomizationUUID": "96c23a4a-6887-4b2c-9cce-1e4ea35eaade",
-            "resourceInvariantUUID": "23122c9b-dd7f-483f-bf0a-e069303db2f7",
-            "resourceName": "Vf zrdm5bpxmc02092017-VF",
-            "resourceType": "VF",
-            "resourceUUID": "14ba5d1e-3862-407c-a236-1cbaebccce77",
-            "resourceVersion": "1.0",
-            "category": "Generic",
-            "subCategory": "Network Elements",
-            "artifacts": [
-                {
-                    "artifactName": "pxmc_mmn_volume.env",
-                    "artifactVersion": "2",
-                    "artifactType": "HEAT_ENV",
-                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                    "artifactTimeout": "0",
-                    "artifactURL": "pxmc_mmn_volume.env",
-                    "artifactUUID": "c1ae6284-48d9-4437-a195-b2cf2ba23070",
-                    "artifactChecksum": "NmEyZjc1Y2UwZDMwYjFhNGRlMTMzN2JhNzdiMThjMGU="
-                },
-                {
-                    "artifactName": "pxmc_base.env",
-                    "artifactVersion": "2",
-                    "artifactType": "HEAT_ENV",
-                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                    "artifactTimeout": "0",
-                    "artifactURL": "pxmc_base.env",
-                    "artifactUUID": "6dd99c31-c52e-4c45-b99b-d223c877a296",
-                    "artifactChecksum": "OGM2MWIzZTA2OTc5YjQwNTM1NGVhODA0YTFkNzM4ZTg="
-                },
-                {
-                    "artifactName": "vfzrdm5bpxmc02092017vf0_modules.json",
-                    "artifactVersion": "1",
-                    "artifactType": "VF_MODULES_METADATA",
-                    "artifactDescription": "Auto-generated VF Modules information artifact",
-                    "artifactTimeout": "0",
-                    "artifactURL": "vfzrdm5bpxmc02092017vf0_modules.json",
-                    "artifactUUID": "e3b82cd6-485e-4d56-8d2c-17ccf6a59533",
-                    "artifactChecksum": "MjY0NzcxMjJkZGI4YzQ1MDU2NjhkNWYyM2IwNmYzYmU="
-                },
-                {
-                    "artifactName": "pxmc_vmt.yaml",
-                    "artifactVersion": "1",
-                    "artifactType": "HEAT",
-                    "artifactDescription": "created from csar",
-                    "artifactTimeout": "120",
-                    "artifactURL": "pxmc_vmt.yaml",
-                    "artifactUUID": "ad12ab80-5419-4346-a5d7-dac2fc15575f",
-                    "artifactChecksum": "ODE0YTRiYzc2YzkxOTliZjJhNjc0M2RhMWU4M2VlZmE=",
-                    "generatedArtifact": {
-                        "artifactInfo": {
-                            "artifactName": "pxmc_vmt.env",
-                            "artifactVersion": "2",
-                            "artifactType": "HEAT_ENV",
-                            "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                            "artifactTimeout": "0",
-                            "artifactURL": "pxmc_vmt.env",
-                            "artifactUUID": "bc1640f1-69f0-4760-8fc3-3318ec2ff129",
-                            "artifactChecksum": "MjdkYzY5ZGU0ZTlkZDlhNzI2ZGVhMjk1ODVhZTg1NTY="
-                        }
-                    },
-                    "relatedArtifacts": [{
-                        "artifactInfo": {
-                            "artifactName": "user_data_zrdm5bpxmc02vmt001.txt",
-                            "artifactVersion": "1",
-                            "artifactType": "HEAT_ARTIFACT",
-                            "artifactDescription": "created from csar",
-                            "artifactTimeout": "0",
-                            "artifactURL": "user_data_zrdm5bpxmc02vmt001.txt",
-                            "artifactUUID": "53acdabe-689f-45e5-8578-f1514d3529da",
-                            "artifactChecksum": "MzJmZjgyZWYwOTBjMTg5M2ExNWZhMmMwNzc1NWY1YjQ="
-                        }
-                    }]
-                },
-                {
-                    "artifactName": "pxmc_mmn.yaml",
-                    "artifactVersion": "1",
-                    "artifactType": "HEAT",
-                    "artifactDescription": "created from csar",
-                    "artifactTimeout": "120",
-                    "artifactURL": "pxmc_mmn.yaml",
-                    "artifactUUID": "b8bca13b-811f-44ab-9d27-45b842c664d8",
-                    "artifactChecksum": "YmNiYTU5YTM4ODVhYTlhODc5NGMwNWZkZjI5MTRmNTE=",
-                    "generatedArtifact": {
-                        "artifactInfo": {
-                            "artifactName": "pxmc_mmn.env",
-                            "artifactVersion": "2",
-                            "artifactType": "HEAT_ENV",
-                            "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                            "artifactTimeout": "0",
-                            "artifactURL": "pxmc_mmn.env",
-                            "artifactUUID": "e88ce0b9-1496-4d03-ab1d-6d8d79bfc737",
-                            "artifactChecksum": "ZGI1NzI2Y2FmYjFhOTM2ZDYwNzg1YWRhZjBmMTk2OTQ="
-                        }
-                    },
-                    "relatedArtifacts": [{
-                        "artifactInfo": {
-                            "artifactName": "user_data_zrdm5bpxmc02mmn001.txt",
-                            "artifactVersion": "1",
-                            "artifactType": "HEAT_ARTIFACT",
-                            "artifactDescription": "created from csar",
-                            "artifactTimeout": "0",
-                            "artifactURL": "user_data_zrdm5bpxmc02mmn001.txt",
-                            "artifactUUID": "5bc62c72-5f7a-40bc-a167-1a4fed9afdef",
-                            "artifactChecksum": "OTMxMjk5Mzc1YmIxMzRlYmRlZWJhMjg0MWQ4YTI1NWU="
-                        }
-                    }]
-                },
-                {
-                    "artifactName": "pxmc_mmn.env",
-                    "artifactVersion": "2",
-                    "artifactType": "HEAT_ENV",
-                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                    "artifactTimeout": "0",
-                    "artifactURL": "pxmc_mmn.env",
-                    "artifactUUID": "e88ce0b9-1496-4d03-ab1d-6d8d79bfc737",
-                    "artifactChecksum": "ZGI1NzI2Y2FmYjFhOTM2ZDYwNzg1YWRhZjBmMTk2OTQ="
-                },
-                {
-                    "artifactName": "pxmc_vmt.env",
-                    "artifactVersion": "2",
-                    "artifactType": "HEAT_ENV",
-                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                    "artifactTimeout": "0",
-                    "artifactURL": "pxmc_vmt.env",
-                    "artifactUUID": "bc1640f1-69f0-4760-8fc3-3318ec2ff129",
-                    "artifactChecksum": "MjdkYzY5ZGU0ZTlkZDlhNzI2ZGVhMjk1ODVhZTg1NTY="
-                },
-                {
-                    "artifactName": "user_data_zrdm5bpxmc02mmn001.txt",
-                    "artifactVersion": "1",
-                    "artifactType": "HEAT_ARTIFACT",
-                    "artifactDescription": "created from csar",
-                    "artifactTimeout": "0",
-                    "artifactURL": "user_data_zrdm5bpxmc02mmn001.txt",
-                    "artifactUUID": "5bc62c72-5f7a-40bc-a167-1a4fed9afdef",
-                    "artifactChecksum": "OTMxMjk5Mzc1YmIxMzRlYmRlZWJhMjg0MWQ4YTI1NWU="
-                },
-                {
-                    "artifactName": "pxmc_base.yaml",
-                    "artifactVersion": "1",
-                    "artifactType": "HEAT",
-                    "artifactDescription": "created from csar",
-                    "artifactTimeout": "120",
-                    "artifactURL": "pxmc_base.yaml",
-                    "artifactUUID": "7e7f7356-11bd-4f2f-bbbc-5c10954e3189",
-                    "artifactChecksum": "YThkNGFhZjAwNmM4NzMzODc0YzNhYTUxOTljNGQwNmM=",
-                    "generatedArtifact": {
-                        "artifactInfo": {
-                            "artifactName": "pxmc_base.env",
-                            "artifactVersion": "2",
-                            "artifactType": "HEAT_ENV",
-                            "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                            "artifactTimeout": "0",
-                            "artifactURL": "pxmc_base.env",
-                            "artifactUUID": "6dd99c31-c52e-4c45-b99b-d223c877a296",
-                            "artifactChecksum": "OGM2MWIzZTA2OTc5YjQwNTM1NGVhODA0YTFkNzM4ZTg="
-                        }
-                    }
-                },
-                {
-                    "artifactName": "user_data_zrdm5bpxmc02vmt001.txt",
-                    "artifactVersion": "1",
-                    "artifactType": "HEAT_ARTIFACT",
-                    "artifactDescription": "created from csar",
-                    "artifactTimeout": "0",
-                    "artifactURL": "user_data_zrdm5bpxmc02vmt001.txt",
-                    "artifactUUID": "53acdabe-689f-45e5-8578-f1514d3529da",
-                    "artifactChecksum": "MzJmZjgyZWYwOTBjMTg5M2ExNWZhMmMwNzc1NWY1YjQ="
-                },
-                {
-                    "artifactName": "pxmc_mmn_volume.yaml",
-                    "artifactVersion": "2",
-                    "artifactType": "HEAT_VOL",
-                    "artifactDescription": "created from csar",
-                    "artifactTimeout": "120",
-                    "artifactURL": "pxmc_mmn_volume.yaml",
-                    "artifactUUID": "2f372a02-df1b-46ca-b81e-822e3f406965",
-                    "artifactChecksum": "MzA5MGY5ODQ0NDY5MDhiMDM3YjFlNGIwNzJkNjFhOTI=",
-                    "generatedArtifact": {
-                        "artifactInfo": {
-                            "artifactName": "pxmc_mmn_volume.env",
-                            "artifactVersion": "2",
-                            "artifactType": "HEAT_ENV",
-                            "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
-                            "artifactTimeout": "0",
-                            "artifactURL": "pxmc_mmn_volume.env",
-                            "artifactUUID": "c1ae6284-48d9-4437-a195-b2cf2ba23070",
-                            "artifactChecksum": "NmEyZjc1Y2UwZDMwYjFhNGRlMTMzN2JhNzdiMThjMGU="
-                        }
-                    }
-                }
-            ]
-        }
-    ]
-}