Skip to content

Adapt WebApi to latest changes in the registry #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 8, 2018
Merged

Adapt WebApi to latest changes in the registry #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac62649
Adapted instance registry client to reflect the interface change in e…
Nov 4, 2018
d2f3ac7
Adapted instance model to reflect latest changes: attribute 'labels' …
Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/scala/de/upb/cs/swt/delphi/instancemanagement/Instance.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ trait JsonSupport extends SprayJsonSupport with DefaultJsonProtocol {
}
}

implicit val instanceFormat : JsonFormat[Instance] = jsonFormat7(Instance)
implicit val instanceFormat : JsonFormat[Instance] = jsonFormat8(Instance)
}

final case class Instance (
Expand All @@ -64,7 +64,8 @@ final case class Instance (
name: String,
componentType: InstanceEnums.ComponentType,
dockerId: Option[String],
instanceState: InstanceEnums.State
instanceState: InstanceEnums.State,
labels: List[String]
)
object InstanceEnums {
type ComponentType = ComponentType.Value
Expand Down
15 changes: 8 additions & 7 deletions src/main/scala/de/upb/cs/swt/delphi/instancemanagement/InstanceRegistry.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ object InstanceRegistry extends JsonSupport with AppLogging
if(!configuration.usingInstanceRegistry) {
Failure(new RuntimeException("Cannot get ElasticSearch instance from Instance Registry, no Instance Registry available."))
} else {
val request = HttpRequest(method = HttpMethods.GET, configuration.instanceRegistryUri + "/matchingInstance?ComponentType=ElasticSearch")
val request = HttpRequest(method = HttpMethods.GET,
configuration.instanceRegistryUri +
s"/matchingInstance?Id=${configuration.assignedID.getOrElse(-1)}&ComponentType=ElasticSearch")

Await.result(Http(system).singleRequest(request) map {response =>
response.status match {
Expand Down Expand Up @@ -189,18 +191,17 @@ object InstanceRegistry extends JsonSupport with AppLogging
val idToPost = configuration.elasticsearchInstance.id.getOrElse(-1L)
val request = HttpRequest(
method = HttpMethods.POST,
configuration.instanceRegistryUri + s"/matchingResult?Id=$idToPost&MatchingSuccessful=$isElasticSearchReachable")
configuration.instanceRegistryUri +
s"/matchingResult?CallerId=${configuration.assignedID.getOrElse(-1)}&MatchedInstanceId=$idToPost&MatchingSuccessful=$isElasticSearchReachable")

Await.result(Http(system).singleRequest(request) map {response =>
val status=response.status
if(response.status == StatusCodes.OK){
log.info(s"Successfully posted matching result to Instance Registry.")
Success()
}
else {
val statuscode = response.status
log.warning(s"Failed to post matching result to Instance Registry, server returned $statuscode")
Failure(new RuntimeException(s"Failed to post matching result to Instance Registry, server returned $statuscode"))
log.warning(s"Failed to post matching result to Instance Registry, server returned ${response.status}")
Failure(new RuntimeException(s"Failed to post matching result to Instance Registry, server returned ${response.status}"))
}

} recover {case ex =>
Expand Down Expand Up @@ -252,7 +253,7 @@ object InstanceRegistry extends JsonSupport with AppLogging

private def createInstance(id: Option[Long], controlPort : Int, name : String) : Instance =
Instance(id, InetAddress.getLocalHost.getHostAddress,
controlPort, name, ComponentType.WebApi, None, InstanceState.Running)
controlPort, name, ComponentType.WebApi, None, InstanceState.Running, List.empty[String])

def reportStart(id: String, configuration: Configuration):Try[ResponseEntity] ={
val request = HttpRequest(method = HttpMethods.GET, configuration.instanceRegistryUri + "/reportStart")
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/de/upb/cs/swt/delphi/webapi/Configuration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ class Configuration( //Server and Elasticsearch configuration
"Default ElasticSearch instance",
ComponentType.ElasticSearch,
None,
InstanceState.Running)
InstanceState.Running,
List.empty[String])
}
val defaultElasticSearchPort: Int = 9200
val defaultElasticSearchHost: String = "elasticsearch://localhost"
Expand Down