diff options
author | Ofir Sonsino <os0695@intl.att.com> | 2018-08-12 12:20:55 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-08-12 12:20:55 +0000 |
commit | 91b057331b92ecf7f3c2d495681b05295dc8346c (patch) | |
tree | 0ce3f821ada8ad518784f7f9869db4b537ba3237 /vid-automation/src/main/java/vid/automation/test/services/ServicesService.java | |
parent | 9152b2ae03c4751b492a219993d85d522c58b383 (diff) | |
parent | 4a4dcc5185f8ba5a28c7f9fef509f32c0c2389e6 (diff) |
Merge "vid-automation selenium tests"
Diffstat (limited to 'vid-automation/src/main/java/vid/automation/test/services/ServicesService.java')
-rw-r--r-- | vid-automation/src/main/java/vid/automation/test/services/ServicesService.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java b/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java index 39f235b9..34303a97 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java +++ b/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java @@ -3,7 +3,10 @@ package vid.automation.test.services; import com.fasterxml.jackson.databind.ObjectMapper; import org.openecomp.sdc.ci.tests.utilities.FileHandling; import vid.automation.test.model.Service; +import vid.automation.test.model.ServiceModel; +import vid.automation.test.model.ServiceModelsList; import vid.automation.test.model.ServicesObject; +import vid.automation.test.utils.ReadFile; import java.io.File; import java.io.IOException; @@ -14,13 +17,14 @@ import java.util.HashMap; */ public class ServicesService { private HashMap<String, Service> services; + private HashMap<String, ServiceModel> serviceModels; - public ServicesService() throws IOException { + public ServicesService() { services = getServicesFromJson(); - + serviceModels = getServiceInstancesFromJson(); } - HashMap<String, Service> getServicesFromJson() throws IOException { + HashMap<String, Service> getServicesFromJson() { String fileName = "services"; ObjectMapper mapper = new ObjectMapper(); ServicesObject servicesObject; @@ -41,7 +45,15 @@ public class ServicesService { } } + HashMap<String, ServiceModel> getServiceInstancesFromJson() { + return ReadFile.getJsonFile("serviceModels", ServiceModelsList.class).serviceModels; + } + public Service getService(String serviceId) { return services.get(serviceId); } + + public ServiceModel getServiceModel(String modelUUID) { + return (ServiceModel) serviceModels.get(modelUUID); + } } |