Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Create READDME file for O-RU closed loop consumer"
[nonrtric.git]
/
dmaap-adaptor-java
/
src
/
test
/
java
/
org
/
oran
/
dmaapadapter
/
EcsSimulatorController.java
diff --git
a/dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/EcsSimulatorController.java
b/dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/EcsSimulatorController.java
index
c042034
..
828b027
100644
(file)
--- a/
dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/EcsSimulatorController.java
+++ b/
dmaap-adaptor-java/src/test/java/org/oran/dmaapadapter/EcsSimulatorController.java
@@
-45,8
+45,8
@@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-@RestController("
E
csSimulatorController")
-@Tag(name = "
EcsSimulator
")
+@RestController("
I
csSimulatorController")
+@Tag(name = "
Information Coordinator Service Simulator (exists only in test)
")
public class EcsSimulatorController {
private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public class EcsSimulatorController {
private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@
-54,14
+54,16
@@
public class EcsSimulatorController {
public static class TestResults {
public static class TestResults {
- ProducerRegistrationInfo registrationInfo;
+ ProducerRegistrationInfo registrationInfo
= null
;
Map<String, ProducerInfoTypeInfo> types = new HashMap<>();
Map<String, ProducerInfoTypeInfo> types = new HashMap<>();
+ String infoProducerId = null;
public TestResults() {}
public void reset() {
registrationInfo = null;
types.clear();
public TestResults() {}
public void reset() {
registrationInfo = null;
types.clear();
+ infoProducerId = null;
}
}
}
}
@@
-86,6
+88,7
@@
public class EcsSimulatorController {
@PathVariable("infoProducerId") String infoProducerId, //
@RequestBody ProducerRegistrationInfo registrationInfo) {
testResults.registrationInfo = registrationInfo;
@PathVariable("infoProducerId") String infoProducerId, //
@RequestBody ProducerRegistrationInfo registrationInfo) {
testResults.registrationInfo = registrationInfo;
+ testResults.infoProducerId = infoProducerId;
return new ResponseEntity<>(HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.OK);
}
@@
-97,13
+100,19
@@
public class EcsSimulatorController {
return new ResponseEntity<>(HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.OK);
}
- public void addJob(ConsumerJobInfo job, AsyncRestClient restClient) {
+ public void addJob(ConsumerJobInfo job,
String jobId,
AsyncRestClient restClient) {
String url = this.testResults.registrationInfo.jobCallbackUrl;
ProducerJobInfo request =
String url = this.testResults.registrationInfo.jobCallbackUrl;
ProducerJobInfo request =
- new ProducerJobInfo(job.jobDefinition,
"ID"
, job.infoTypeId, job.jobResultUri, job.owner, "TIMESTAMP");
+ new ProducerJobInfo(job.jobDefinition,
jobId
, job.infoTypeId, job.jobResultUri, job.owner, "TIMESTAMP");
String body = gson.toJson(request);
logger.info("ECS Simulator PUT job: {}", body);
restClient.post(url, body).block();
String body = gson.toJson(request);
logger.info("ECS Simulator PUT job: {}", body);
restClient.post(url, body).block();
+ }
+
+ public void deleteJob(String jobId, AsyncRestClient restClient) {
+ String url = this.testResults.registrationInfo.jobCallbackUrl + "/" + jobId;
+ logger.info("ECS Simulator DELETE job: {}", url);
+ restClient.delete(url).block();
}
}
}
}