summaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2019-04-02 22:54:57 -0400
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2019-04-02 22:54:57 -0400
commit86f04e1d55b54a1a23bb274d211c6fca85980fef (patch)
treee8fb0a8c1d5e64761068df56faa8a8e509fa2f48 /mso-api-handlers/mso-api-handler-infra/src/test/resources/__files
parentd59fc0ad5db7b7cacf5996f86db34f41090061fa (diff)
fix catalogdb cvfnc customization
Hibernate entities were all wrong and needed a complete rewrite. The scope kept growing and ended up touching a lot more of the code than originally planned. These changes make the db interactions much easier and more straightforward from java. The flyway script order had to change to make this migration possible. Change-Id: I6ce363a385661300eddb11923ac6a80538edaddc Issue-ID: SO-1710 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src/test/resources/__files')
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationPCM_Response.json11
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationVolGrp_Response.json11
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomization_Response.json11
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationsPCM_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModulePCM_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomizationForVfModule_Response.json11
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_ReplaceVnf_Response.json17
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_Response.json67
8 files changed, 86 insertions, 68 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationPCM_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationPCM_Response.json
index 895c905ec9..4e760b71f1 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationPCM_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationPCM_Response.json
@@ -1,4 +1,5 @@
{
+ "id" : 2,
"modelCustomizationUUID": "b4ea86b4-253f-11e7-93ae-92361f002672",
"label": "PCM",
"minInstances": 0,
@@ -8,19 +9,19 @@
"created": "2017-05-26 09:38:23.000",
"_links": {
"self": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672"
+ "href": "http://localhost:8090/vfModuleCustomization/2"
},
"vfModuleCustomization": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672"
+ "href": "http://localhost:8090/vfModuleCustomization/2"
},
"volumeHeatEnv": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/volumeHeatEnv"
+ "href": "http://localhost:8090/vfModuleCustomization/2/volumeHeatEnv"
},
"heatEnvironment": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/heatEnvironment"
+ "href": "http://localhost:8090/vfModuleCustomization/2/heatEnvironment"
},
"vfModule": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/vfModule"
+ "href": "http://localhost:8090/vfModuleCustomization/2/vfModule"
}
}
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationVolGrp_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationVolGrp_Response.json
index dd7fbe1a84..9ffd759416 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationVolGrp_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationVolGrp_Response.json
@@ -1,4 +1,5 @@
{
+ "id": 1,
"modelCustomizationUUID": "b4ea86b4-253f-11e7-93ae-92361f002671",
"label": "PCM",
"minInstances": 0,
@@ -8,19 +9,19 @@
"created": "2017-05-26 09:38:23.000",
"_links": {
"self": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"
+ "href": "http://localhost:8090/vfModuleCustomization/1"
},
"vfModuleCustomization": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671"
+ "href": "http://localhost:8090/vfModuleCustomization/1"
},
"volumeHeatEnv": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/volumeHeatEnv"
+ "href": "http://localhost:8090/vfModuleCustomization/1/volumeHeatEnv"
},
"vfModule": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/vfModule"
+ "href": "http://localhost:8090/vfModuleCustomization/1/vfModule"
},
"heatEnvironment": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002671/heatEnvironment"
+ "href": "http://localhost:8090/vfModuleCustomization/1/heatEnvironment"
}
}
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomization_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomization_Response.json
index a3ace2b24c..c23471fd31 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomization_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomization_Response.json
@@ -1,4 +1,5 @@
{
+ "id" : 1,
"modelCustomizationUUID": "cb82ffd8-252a-11e7-93ae-92361f002671",
"label": "base",
"minInstances": 0,
@@ -8,19 +9,19 @@
"created": "2017-05-26 09:38:23.000",
"_links": {
"self": {
- "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"
+ "href": "http://localhost:8090/vfModuleCustomization/1"
},
"vfModuleCustomization": {
- "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671"
+ "href": "http://localhost:8090/vfModuleCustomization/1"
},
"volumeHeatEnv": {
- "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/volumeHeatEnv"
+ "href": "http://localhost:8090/vfModuleCustomization/1/volumeHeatEnv"
},
"vfModule": {
- "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/vfModule"
+ "href": "http://localhost:8090/vfModuleCustomization/1/vfModule"
},
"heatEnvironment": {
- "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002671/heatEnvironment"
+ "href": "http://localhost:8090/vfModuleCustomization/1/heatEnvironment"
}
}
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationsPCM_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationsPCM_Response.json
index 4743bd39b2..5f7399ee26 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationsPCM_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModuleCustomizationsPCM_Response.json
@@ -2,6 +2,7 @@
"_embedded": {
"vfModuleCustomization": [
{
+ "id" : "1",
"modelCustomizationUUID": "b4ea86b4-253f-11e7-93ae-92361f002672",
"label": "PCM",
"minInstances": 0,
@@ -11,19 +12,19 @@
"created": "2017-05-26 09:38:23.000",
"_links": {
"self": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672"
+ "href": "http://localhost:8090/vfModuleCustomization/1"
},
"vfModuleCustomization": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672"
+ "href": "http://localhost:8090/vfModuleCustomization/1"
},
"volumeHeatEnv": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/volumeHeatEnv"
+ "href": "http://localhost:8090/vfModuleCustomization/1/volumeHeatEnv"
},
"heatEnvironment": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/heatEnvironment"
+ "href": "http://localhost:8090/vfModuleCustomization/1/heatEnvironment"
},
"vfModule": {
- "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/vfModule"
+ "href": "http://localhost:8090/vfModuleCustomization/1/vfModule"
}
}
}
@@ -31,7 +32,7 @@
},
"_links": {
"self": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"
+ "href": "http://localhost:8090/vnfResourceCustomization/1/vfModuleCustomizations"
}
}
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModulePCM_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModulePCM_Response.json
index d4693bd075..8f717da9c6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModulePCM_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vfModulePCM_Response.json
@@ -1,4 +1,5 @@
{
+ "id" : 2,
"modelUUID": "066de97e-253e-11e7-93ae-92361f002672",
"modelInvariantUUID": "64efd51a-2544-11e7-93ae-92361f002671",
"modelName": "test::PCM::module-1",
@@ -9,22 +10,22 @@
"heatFiles": [],
"_links": {
"self": {
- "href": "http://localhost:8090/vfModule/066de97e-253e-11e7-93ae-92361f002672"
+ "href": "http://localhost:8090/vfModule/2"
},
"vfModule": {
- "href": "http://localhost:8090/vfModule/066de97e-253e-11e7-93ae-92361f002672"
+ "href": "http://localhost:8090/vfModule/2"
},
"vfModuleCustomization": {
- "href": "http://localhost:8090/vfModule/066de97e-253e-11e7-93ae-92361f002672/vfModuleCustomization"
+ "href": "http://localhost:8090/vfModule/2/vfModuleCustomization"
},
"volumeHeatTemplate": {
- "href": "http://localhost:8090/vfModule/066de97e-253e-11e7-93ae-92361f002672/volumeHeatTemplate"
+ "href": "http://localhost:8090/vfModule/2/volumeHeatTemplate"
},
"vnfResources": {
- "href": "http://localhost:8090/vfModule/066de97e-253e-11e7-93ae-92361f002672/vnfResources"
+ "href": "http://localhost:8090/vfModule/2/vnfResources"
},
"moduleHeatTemplate": {
- "href": "http://localhost:8090/vfModule/066de97e-253e-11e7-93ae-92361f002672/moduleHeatTemplate"
+ "href": "http://localhost:8090/vfModule/2/moduleHeatTemplate"
}
}
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomizationForVfModule_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomizationForVfModule_Response.json
index 85a02e76ba..ae46c418af 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomizationForVfModule_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomizationForVfModule_Response.json
@@ -1,4 +1,5 @@
{
+ "id" : 3,
"modelCustomizationUUID": "68dc9a92-214c-11e7-93ae-92361f002673",
"modelInstanceName": "test",
"created": "2017-05-26 09:38:24.000",
@@ -13,20 +14,20 @@
"creationTimestamp": "2017-05-26T09:38:24.000+0000",
"_links": {
"self": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673"
+ "href": "http://localhost:8090/vnfResourceCustomization/3"
},
"vnfResourceCustomization": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673{?projection}",
+ "href": "http://localhost:8090/vnfResourceCustomization/3{?projection}",
"templated": true
},
"vnfResources": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vnfResources"
+ "href": "http://localhost:8090/vnfResourceCustomization/3/vnfResources"
},
"vfModuleCustomizations": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vfModuleCustomizations"
+ "href": "http://localhost:8090/vnfResourceCustomization/3/vfModuleCustomizations"
},
"vnfcInstanceGroupCustomizations": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002673/vnfcInstanceGroupCustomizations"
+ "href": "http://localhost:8090/vnfResourceCustomization/3/vnfcInstanceGroupCustomizations"
}
}
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_ReplaceVnf_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_ReplaceVnf_Response.json
index 97e2be4a6a..0b7752d2dc 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_ReplaceVnf_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_ReplaceVnf_Response.json
@@ -1,4 +1,7 @@
{
+ "_embedded": {
+ "vnfResourceCustomization": [{
+ "id" : 1,
"modelCustomizationUUID": "68dc9a92-214c-11e7-93ae-92361f002671",
"modelInstanceName": "v10 1",
"created": "2017-05-26 09:38:24.000",
@@ -13,20 +16,22 @@
"creationTimestamp": "2017-05-26T09:38:24.000+0000",
"_links": {
"self": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671"
+ "href": "http://localhost:8090/vnfResourceCustomization/1"
},
"vnfResourceCustomization": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671{?projection}",
+ "href": "http://localhost:8090/vnfResourceCustomization/1{?projection}",
"templated": true
},
"vnfResources": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671/vnfResources"
+ "href": "http://localhost:8090/vnfResourceCustomization/1/vnfResources"
},
"vfModuleCustomizations": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671/vfModuleCustomizations"
+ "href": "http://localhost:8090/vnfResourceCustomization/1/vfModuleCustomizations"
},
"vnfcInstanceGroupCustomizations": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002671/vnfcInstanceGroupCustomizations"
+ "href": "http://localhost:8090/vnfResourceCustomization/1/vnfcInstanceGroupCustomizations"
}
}
-} \ No newline at end of file
+}]
+ }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_Response.json
index e83ad10245..b5e9999d03 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourceCustomization_Response.json
@@ -1,32 +1,39 @@
{
- "modelCustomizationUUID": "68dc9a92-214c-11e7-93ae-92361f002674",
- "modelInstanceName": "test",
- "created": "2017-05-26 09:38:24.000",
- "minInstances": 0,
- "maxInstances": 0,
- "availabilityZoneMaxCount": 0,
- "nfFunction": "",
- "nfType": "",
- "nfRole": "TEST",
- "nfNamingCode": "",
- "multiStageDesign": null,
- "creationTimestamp": "2017-05-26T09:38:24.000+0000",
- "_links": {
- "self": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674"
- },
- "vnfResourceCustomization": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674{?projection}",
- "templated": true
- },
- "vnfcInstanceGroupCustomizations": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfcInstanceGroupCustomizations"
- },
- "vnfResources": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vnfResources"
- },
- "vfModuleCustomizations": {
- "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002674/vfModuleCustomizations"
- }
+ "_embedded": {
+ "vnfResourceCustomization": [
+ {
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/vnfResourceCustomization/4"
+ },
+ "vfModuleCustomizations": {
+ "href": "http://localhost:8090/vnfResourceCustomization/4/vfModuleCustomizations"
+ },
+ "vnfResourceCustomization": {
+ "href": "http://localhost:8090/vnfResourceCustomization/4{?projection}",
+ "templated": true
+ },
+ "vnfResources": {
+ "href": "http://localhost:8090/vnfResourceCustomization/4/vnfResources"
+ },
+ "vnfcInstanceGroupCustomizations": {
+ "href": "http://localhost:8090/vnfResourceCustomization/4/vnfcInstanceGroupCustomizations"
+ }
+ },
+ "availabilityZoneMaxCount": 0,
+ "created": "2017-05-26 09:38:24.000",
+ "creationTimestamp": "2017-05-26T09:38:24.000+0000",
+ "id": 4,
+ "maxInstances": 0,
+ "minInstances": 0,
+ "modelCustomizationUUID": "68dc9a92-214c-11e7-93ae-92361f002674",
+ "modelInstanceName": "test",
+ "multiStageDesign": null,
+ "nfFunction": "",
+ "nfNamingCode": "",
+ "nfRole": "TEST",
+ "nfType": ""
+ }
+ ]
}
-} \ No newline at end of file
+}