From d1f45bb6a7d3af61d9f6325a0fb729b37d4421cc Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 1 Apr 2021 13:53:09 -0400 Subject: Resolve junit failures Resolved junit test issues Change-Id: I3e044b8e68f0a883d2a64b15c9de9c99d10ceceb Issue-ID: SDNC-1513 Signed-off-by: Dan Timoney --- .../gra/controllers/OperationsApiController.java | 4 ++ .../apps/ms/gra/controllers/ServiceDataHelper.java | 43 ++++++++++++++++++---- .../db/changelog/db.changelog-master.yaml | 2 +- 3 files changed, 40 insertions(+), 9 deletions(-) (limited to 'ms/generic-resource-api/src/main') diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java index 19c8ca0..cbf571d 100644 --- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java +++ b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java @@ -40,6 +40,7 @@ import org.onap.ccsdk.apps.services.RestException; import org.onap.ccsdk.apps.services.SvcLogicFactory; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicLoader; import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceBase; import org.onap.sdnc.apps.ms.gra.data.ConfigContrailRouteAllottedResourcesRepository; import org.onap.sdnc.apps.ms.gra.data.ConfigNetworksRepository; @@ -129,6 +130,9 @@ public class OperationsApiController implements OperationsApi { @Autowired protected SvcLogicServiceBase svc; + @Autowired + protected SvcLogicLoader svcLogicLoader; + @Autowired private ConfigPreloadDataRepository configPreloadDataRepository; diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java index f120f8c..1fbf02b 100644 --- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java +++ b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java @@ -30,9 +30,11 @@ import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.ComponentScan; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; @Component @ComponentScan(basePackages = { "org.onap.sdnc.apps.ms.gra.*", "org.onap.ccsdk.apps.services" }) + public class ServiceDataHelper { @Autowired @@ -65,41 +67,58 @@ public class ServiceDataHelper { private List vnfsToRemove = new LinkedList(); private List vfModulesToRemove = new LinkedList(); + // Deferred saves not working for now - do all immediate public void save(ConfigServices service) { - servicesToSave.add(service); + // servicesToSave.add(service); + configServicesRepository.save(service); } public void save(ConfigNetworks network) { - networksToSave.add(network); + // networksToSave.add(network); + configNetworksRepository.save(network); } public void save(ConfigVnfs vnf) { - vnfsToSave.add(vnf); + // vnfsToSave.add(vnf); + configVnfsRepository.save(vnf); } public void save(ConfigVfModules vfModule) { - vfModulesToSave.add(vfModule); + // vfModulesToSave.add(vfModule); + configVfModulesRepository.save(vfModule); } public void remove(ConfigServices service) { - servicesToRemove.add(service); + // servicesToRemove.add(service); + configServicesRepository.delete(service); } public void remove(ConfigNetworks network) { - networksToRemove.add(network); + // networksToRemove.add(network); + configNetworksRepository.delete(network); } public void remove(ConfigVnfs vnf) { - vnfsToRemove.add(vnf); + // vnfsToRemove.add(vnf); + configVnfsRepository.delete(vnf); } public void remove(ConfigVfModules vfModule) { - vfModulesToRemove.add(vfModule); + // vfModulesToRemove.add(vfModule); + configVfModulesRepository.delete(vfModule); } public void commit() { + long numServicesBefore = configServicesRepository.count(); + long numNetworksBefore = configNetworksRepository.count(); + long numVnfsBefore = configVnfsRepository.count(); + long numVfModulesBefore = configVfModulesRepository.count(); + + // Commit is a no-op for now + return; + /* for (ConfigServices service : servicesToSave) { configServicesRepository.save(service); } @@ -124,6 +143,13 @@ public class ServiceDataHelper { for (ConfigVfModules vfModule : vfModulesToSave) { configVfModulesRepository.delete(vfModule); } + long numServicesAfter = configServicesRepository.count(); + long numNetworksAfter = configNetworksRepository.count(); + long numVnfsAfter = configVnfsRepository.count(); + long numVfModulesAfter = configVfModulesRepository.count(); + + System.out.print("Done"); + */ } } @@ -373,6 +399,7 @@ public class ServiceDataHelper { } else { configVnfsRepository.save(configVnf); } + } public void saveNetwork(String svcInstanceId, GenericResourceApiServicedataServicedataNetworksNetwork network, ServiceDataTransaction transaction) throws JsonProcessingException { diff --git a/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml b/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml index 6a47117..087c324 100644 --- a/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml @@ -384,7 +384,7 @@ databaseChangeLog: nullable: false - column: name: graph - type: blob + type: longblob - column: name: modified_timestamp type: timestamp -- cgit 1.2.3-korg