diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-08-30 14:26:55 -0400 |
|---|---|---|
| committer | Rob Daugherty <rd472p@att.com> | 2018-08-30 14:30:01 -0400 |
| commit | add0df04cc24deae1f16a215dffa32393ed586ca (patch) | |
| tree | 14f0cecd915eb2d5ffafa46dc27080181c71c564 /mso-catalog-db/src/test | |
| parent | 1ff9c3d426e0a67bef180a324d8e77962a7e72c1 (diff) | |
Create a Reference Table for Controller Selection
Also: Modify Alacarte Reference Data
This commit consolidates changes from three abandoned commits:
https://gerrit.onap.org/r/60959
https://gerrit.onap.org/r/60953
https://gerrit.onap.org/r/60397
Change-Id: I295a79cb05ca742ae5743892397e75c7c228bde3
Issue-ID: SO-763
Issue-ID: SO-676
Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'mso-catalog-db/src/test')
| -rw-r--r-- | mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java | 10 | ||||
| -rw-r--r-- | mso-catalog-db/src/test/resources/data.sql | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java index f793fd79e3..9aa2ca0c73 100644 --- a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java +++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java @@ -42,16 +42,6 @@ public class ControllerSelectionReferenceTest { @Autowired private ControllerSelectionReferenceRepository controllerSelectionReferenceRepository; - - @Test - public void Find_ControllerNameByVnfType_Test() { - String vnfType = "vLoadBalancerMS/vLoadBalancerMS 0"; - String controllerName = "APPC"; - ControllerSelectionReference controller = controllerSelectionReferenceRepository.findControllerSelectionReferenceByVnfType(vnfType); - assertEquals(vnfType, controller.getVnfType()); - assertEquals(controllerName, controller.getControllerName()); - } - @Test public void Find_ControllerNameByVnfTypeAndAction_Test() { String vnfType = "vLoadBalancerMS/vLoadBalancerMS 0"; diff --git a/mso-catalog-db/src/test/resources/data.sql b/mso-catalog-db/src/test/resources/data.sql index 58bde0e532..9da6d13e49 100644 --- a/mso-catalog-db/src/test/resources/data.sql +++ b/mso-catalog-db/src/test/resources/data.sql @@ -649,4 +649,5 @@ INSERT INTO `identity_services` (`ID`, `IDENTITY_URL`, `MSO_ID`, `MSO_PASS`, `AD INSERT INTO `cloud_sites` (`ID`, `REGION_ID`, `IDENTITY_SERVICE_ID`, `CLOUD_VERSION`, `CLLI`, `CLOUDIFY_ID`, `PLATFORM`, `ORCHESTRATOR`, `LAST_UPDATED_BY`, `CREATION_TIMESTAMP`, `UPDATE_TIMESTAMP`) VALUES ('mtn13', 'mtn13', 'MTN13', '2.5', 'MDT13', 'mtn13', NULL, 'orchestrator', 'MSO_USER', '2018-07-17 14:06:28', '2018-07-17 14:06:28'); INSERT INTO `controller_selection_reference` (`VNF_TYPE`, `CONTROLLER_NAME`, `ACTION_CATEGORY`) VALUES -('vLoadBalancerMS/vLoadBalancerMS 0', 'APPC', 'ConfigScaleOut'); +('vLoadBalancerMS/vLoadBalancerMS 0', 'APPC', 'ConfigScaleOut'), +('vLoadBalancerMS/vLoadBalancerMS 0', 'APPC', 'HealthCheck'); |