X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fportal%2Fnonrtric%2Fcontrolpanel%2Fmock%2FEnrichmentControllerMockConfiguration.java;h=b8d75c318f9660a0b746d5089d28b91acb9e7cca;hb=6b3b1b864dea5c5ed5154cf9a7210b672917feca;hp=626f0c43a61e17479f2a477fc5ebaaeb7378f28d;hpb=7c3b8301076b986c22dbec3287339f44b1c1a542;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java
index 626f0c4..b8d75c3 100644
--- a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java
@@ -33,10 +33,13 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.oransc.portal.nonrtric.controlpanel.eiproducerapi.EiProducerApi;
+import org.oransc.portal.nonrtric.controlpanel.model.JobInfo;
+import org.oransc.portal.nonrtric.controlpanel.model.ProducerRegistrationInfo;
+import org.oransc.portal.nonrtric.controlpanel.model.ProducerRegistrationInfo.ProducerEiTypeRegistrationInfo;
+import org.oransc.portal.nonrtric.controlpanel.model.ProducerStatusInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -66,25 +69,6 @@ public class EnrichmentControllerMockConfiguration {
     class MockEiProducerApi implements EiProducerApi {
         private final Database database = new Database();
 
-        @Override
-        public ResponseEntity<String> getAllEiTypeIds() {
-            List<String> result = new ArrayList<>();
-            result.addAll(database.getAllEiTypeIds());
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-        }
-
-        public ResponseEntity<String> getAllEiTypes() {
-            EiTypes result = new EiTypes();
-            result.addAll(database.getAllEiTypes());
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-        }
-
-        @Override
-        public ResponseEntity<String> getEiType(String eiTypeId) {
-            EiType result = database.getEiTypeInstance(eiTypeId);
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-        }
-
         @Override
         public ResponseEntity<String> getAllEiProducerIds() {
             List<String> result = new ArrayList<>();
@@ -93,44 +77,29 @@ public class EnrichmentControllerMockConfiguration {
         }
 
         public ResponseEntity<String> getAllEiProducers() {
-            EiProducers result = new EiProducers();
+            List<ProducerRegistrationInfo> result = new ArrayList<>();
             result.addAll(database.getAllEiProducers());
             return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
         }
 
         @Override
-        public ResponseEntity<String> getEiProducer(String eiProducerId) {
-            EiProducer result = database.getEiProducerInstance(eiProducerId);
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-        }
-
-        @Override
-        public ResponseEntity<String> getEiJobsForOneEiProducer(String eiProducerId) {
-            EiJobs result = new EiJobs();
-            List<EiJob> inst = database.getEiJobsForOneEiProducer(Optional.of(eiProducerId));
-            result.addAll(inst);
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
+        public ResponseEntity<ProducerRegistrationInfo> getEiProducer(String eiProducerId) {
+            ProducerRegistrationInfo result = database.getEiProducerInstance(eiProducerId);
+            return new ResponseEntity<>(result, HttpStatus.OK);
         }
 
         @Override
-        public ResponseEntity<String> getEiProducerStatus(String eiProducerId) {
-            EiProducer result = database.getEiProducerInstance(eiProducerId);
-            return new ResponseEntity<>(gson.toJson(result.status()), HttpStatus.OK);
-        }
+        public ResponseEntity<List<JobInfo>> getEiJobsForOneEiProducer(String eiProducerId) {
+            List<JobInfo> result = new ArrayList<>();
 
-        public ResponseEntity<String> deleteEiProducerInstance(String eiProducerId) {
-            database.deleteEiProducerInstance(eiProducerId);
-            return new ResponseEntity<>(HttpStatus.OK);
+            result.addAll(database.getAllEiJobs());
+            return new ResponseEntity<>(result, HttpStatus.OK);
         }
 
-        public ResponseEntity<String> deleteEiTypeInstance(String eiTypeId) {
-            database.deleteEiTypeInstance(eiTypeId);
-            return new ResponseEntity<>(HttpStatus.OK);
-        }
-
-        public ResponseEntity<String> deleteEiJobInstance(String eiJobId) {
-            database.deleteEiJobInstance(eiJobId);
-            return new ResponseEntity<>(HttpStatus.OK);
+        @Override
+        public ResponseEntity<ProducerStatusInfo> getEiProducerStatus(String eiProducerId) {
+            ProducerRegistrationInfo result = database.getEiProducerInstance(eiProducerId);
+            return new ResponseEntity<>(result.status, HttpStatus.OK);
         }
     }
 
@@ -138,25 +107,34 @@ public class EnrichmentControllerMockConfiguration {
 
         Database() {
 
-            List<EiType> supported_types = new ArrayList<EiType>();
+            List<ProducerEiTypeRegistrationInfo> supported_types = new ArrayList<ProducerEiTypeRegistrationInfo>();
 
-            // Create EiType instance
+            // Create ProducerEiTypeRegistrationInfo instance
             String schema = getStringFromFile("ei-type-1.json");
-            EiType eiType1 = putEiTypeInstance("type1", schema, Arrays.asList("prod-1"));
+            ProducerEiTypeRegistrationInfo eiType1 = getEiTypeInstance("type1", schema, Arrays.asList("prod-1"));
             supported_types.add(eiType1);
 
-            // Create EiType instance
+            // Create ProducerEiTypeRegistrationInfo instance
             schema = getStringFromFile("ei-type-2.json");
-            EiType eiType2 = putEiTypeInstance("type2", schema, Arrays.asList("prod-1"));
+            ProducerEiTypeRegistrationInfo eiType2 = getEiTypeInstance("type2", schema, Arrays.asList("prod-1"));
             supported_types.add(eiType2);
 
-            // Create EiProducer instance
+            // Create ProducerRegistrationInfo instance
             putEiProducerInstance("prod-1", "http://example.com/", "http://example.com/", "http://example.com/",
-                supported_types, "ENABLED");
+                supported_types, new ProducerStatusInfo(ProducerStatusInfo.OperationalState.ENABLED));
+
+            putEiProducerInstance("prod-2", "http://example.com/", "http://example.com/", "http://example.com/",
+                Arrays.asList(supported_types.get(0)), new ProducerStatusInfo(ProducerStatusInfo.OperationalState.DISABLED));
+
+            putEiProducerInstance("3-prod", "http://example.com/", "http://example.com/", "http://example.com/",
+                supported_types, new ProducerStatusInfo(ProducerStatusInfo.OperationalState.ENABLED));
 
             // Create EiJob instance
             schema = getStringFromFile("job-1.json");
-            putEiJobInstance("type1", "job1", schema, "prod-1", "http://example.com/");
+            putEiJobInstance("type1", "job1", schema, "owner", "http://example.com/");
+
+            schema = getStringFromFile("job-1.json");
+            putEiJobInstance("type2", "job2", schema, "owner", "http://example.com/");
         }
 
         private String getStringFromFile(String path) {
@@ -175,41 +153,32 @@ public class EnrichmentControllerMockConfiguration {
         }
 
         void putEiJobInstance(String typeId, String instanceId, Object instanceData, String owner, String targetUrl) {
-            EiJob i = ImmutableEiJob.builder() //
-                .ei_job_data(instanceData) //
-                .ei_job_identity(instanceId) //
+            JobInfo i = JobInfo.builder() //
+                .jobData(instanceData) //
+                .id(instanceId) //
                 .owner(owner) //
-                .ei_type_identity(typeId) //
-                .target_uri(targetUrl) //
-                .status("ENABLED") //
+                .typeId(typeId) //
+                .targetUri(targetUrl) //
                 .build(); //
             eiJobs.put(instanceId, i);
         }
 
         void putEiProducerInstance(String id, String creation_url, String deletion_url, String callback_url,
-            List<EiType> supported_types, String status) {
-            EiProducer eiProducer = ImmutableEiProducer.builder() //
-                .ei_producer_id(id) //
-                .ei_job_creation_callback_url(creation_url) //
-                .ei_job_deletion_callback_url(deletion_url) //
-                .ei_producer_supervision_callback_url(callback_url) //
-                .supported_ei_types(supported_types) //
-                .status(status).build(); //
+            List<ProducerEiTypeRegistrationInfo> supported_types, ProducerStatusInfo status) {
+            ProducerRegistrationInfo eiProducer = ProducerRegistrationInfo.builder() //
+                .jobCallbackUrl(creation_url) //
+                .producerSupervisionCallbackUrl(callback_url) //
+                .types(supported_types) //
+                .status(status) //
+                .build(); //
             eiProducers.put(id, eiProducer);
         }
 
-        EiType putEiTypeInstance(String id, Object data, List<String> producer_ids) {
-            EiType i = ImmutableEiType.builder() //
-                .ei_type_identity(id) //
-                .ei_job_data_schema(data) //
-                .ei_producer_ids(producer_ids) //
+        ProducerEiTypeRegistrationInfo getEiTypeInstance(String id, Object data, List<String> producer_ids) {
+            return ProducerEiTypeRegistrationInfo.builder() //
+                .eiTypeId(id) //
+                .jobDataSchema(data) //
                 .build(); //
-            eiTypes.put(id, i);
-            return eiTypes.get(id);
-        }
-
-        public void deleteEiTypeInstance(String id) {
-            eiTypes.remove(id);
         }
 
         public void deleteEiProducerInstance(String id) {
@@ -220,61 +189,27 @@ public class EnrichmentControllerMockConfiguration {
             eiJobs.remove(id);
         }
 
-        EiType getEiTypeInstance(String id) throws RestClientException {
-            EiType i = eiTypes.get(id);
-            if (i == null) {
-                throw new RestClientException("Type not found: " + id);
-            }
-            return i;
-        }
-
-        EiProducer getEiProducerInstance(String id) throws RestClientException {
-            EiProducer i = eiProducers.get(id);
+        ProducerRegistrationInfo getEiProducerInstance(String id) throws RestClientException {
+            ProducerRegistrationInfo i = eiProducers.get(id);
             if (i == null) {
                 throw new RestClientException("Producer not found: " + id);
             }
             return i;
         }
 
-        public Collection<String> getAllEiTypeIds() {
-            return Collections.unmodifiableCollection(eiTypes.keySet());
-        }
-
-        public Collection<EiType> getAllEiTypes() {
-            return eiTypes.values();
-        }
-
         public Collection<String> getAllEiProducerIds() {
             return Collections.unmodifiableCollection(eiProducers.keySet());
         }
 
-        public Collection<EiProducer> getAllEiProducers() {
+        public Collection<ProducerRegistrationInfo> getAllEiProducers() {
             return eiProducers.values();
         }
 
-        public Collection<EiJob> getAllEiJobs() {
-            return eiJobs.values();
+        public List<JobInfo> getAllEiJobs() {
+            return new ArrayList<>(eiJobs.values());
         }
 
-        public List<EiJob> getEiJobsForOneEiProducer(Optional<String> eiProducerId) {
-            List<EiJob> result = new ArrayList<>();
-            for (EiJob i : eiJobs.values()) {
-                if (eiProducerId.isPresent()) {
-                    if (i.owner().equals(eiProducerId.get())) {
-                        result.add(i);
-                    }
-
-                } else {
-                    result.add(i);
-                }
-            }
-            return result;
-        }
-
-        private Map<String, EiType> eiTypes = new HashMap<>();
-        private Map<String, EiProducer> eiProducers = new HashMap<>();
-        private Map<String, EiJob> eiJobs = new HashMap<>();
-
+        private Map<String, ProducerRegistrationInfo> eiProducers = new HashMap<>();
+        private Map<String, JobInfo> eiJobs = new HashMap<>();
     }
-
 }