Changed instance model: Traefik configuration is now attributte

Johannes Duesing · Johannes Duesing · commit 028ff65ba9ab · 2019-01-31T15:26:37.000+01:00
Host will hold docker IP, traefikConfiguration.hostName will hold Traefik host name
diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/ContainerCommands.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/ContainerCommands.scala
@@ -178,10 +178,17 @@ class ContainerCommands(connection: DockerConnection) extends JsonSupport with C
       response.status match {
         case StatusCodes.OK =>
           Unmarshal(response.entity).to[String].map { json =>
-            val out = json.parseJson.asJsObject.getFields("NetworkSettings")
-            out match {
-              case Seq(network) => Networks(network.asJsObject.fields("IPAddress").toString())
-              case _ => throw DeserializationException("Cannot find required field NetworkSettings/IPAddress")
+
+            Try[Networks]{
+              val ip = json.parseJson.asJsObject.fields("NetworkSettings")
+                .asJsObject.fields("Networks")
+                .asJsObject.fields(Registry.configuration.traefikDockerNetwork)
+                .asJsObject.getFields("IPAddress").head.toString.replace("\"", "")
+              Networks(ip)
+            } match {
+              case Success(network) => network
+              case Failure(ex) =>
+                throw DeserializationException(s"Failed to extract IPAddress from docker with message ${ex.getMessage}")
             }
 
           }
diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerActor.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerActor.scala
@@ -65,8 +65,12 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
         case Failure(ex) => sender ! Failure(ex)
         case Success(containerResult) =>
           Await.ready(container.start(containerResult.Id), Duration.Inf)
-          log.info(s"Docker Instance created and started, host is $traefikHostUrl")
-          sender ! Success(containerResult.Id, traefikHostUrl, instancePort)
+
+          val containerInfo = Await.result(container.get(containerResult.Id), Duration.Inf)
+
+          log.info(s"Docker Instance created and started, ip is ${containerInfo.IPAddress}, host is $traefikHostUrl")
+
+          sender ! Success(containerResult.Id, containerInfo.IPAddress, instancePort, traefikHostUrl)
       }
 
     case stop(containerId) =>
diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandler.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandler.scala
@@ -269,16 +269,18 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
         implicit val timeout: Timeout = configuration.dockerOperationTimeout
 
         val future: Future[Any] = dockerActor ? create(componentType, id)
-        val deployResult = Await.result(future, timeout.duration).asInstanceOf[Try[(String, String, Int)]]
+        val deployResult = Await.result(future, timeout.duration).asInstanceOf[Try[(String, String, Int, String)]]
 
         deployResult match {
           case Failure(ex) =>
             log.error(s"Failed to deploy container, docker host not reachable.")
             instanceDao.removeInstance(id)
             fireDockerOperationErrorEvent(None, s"Deploy failed with message: ${ex.getMessage}")
             Failure(new RuntimeException(s"Failed to deploy container, docker host not reachable (${ex.getMessage})."))
-          case Success((dockerId, host, port)) =>
-            log.info(s"Deployed new container with id $dockerId, host $host and port $port.")
+          case Success((dockerId, host, port, traefikHost)) =>
+            log.info(s"Deployed new container with id $dockerId, host $host, port $port and Traefik host $traefikHost.")
+
+            val traefikConfig = TraefikConfiguration(traefikHost, configuration.traefikUri)
 
             val newInstance = Instance(Some(id),
               host,
@@ -289,7 +291,8 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
               InstanceState.Deploying,
               List.empty[String],
               List.empty[InstanceLink],
-              List.empty[InstanceLink]
+              List.empty[InstanceLink],
+              Some(traefikConfig)
             )
 
             instanceDao.updateInstance(newInstance) match {
diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DatabaseInstanceDAO.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DatabaseInstanceDAO.scala
@@ -42,8 +42,9 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
     val dockerId = instance.dockerId
     val instanceState = instance.instanceState.toString
     val labels = getListAsString(instance.labels)
+    val traefikHost = instance.traefikConfiguration.map(conf => conf.hostName)
 
-    val addFuture: Future[Long] = db.run((instances returning instances.map(_.id)) += (id, host, port, name, componentType, dockerId, instanceState, labels))
+    val addFuture: Future[Long] = db.run((instances returning instances.map(_.id)) += (id, host, port, name, componentType, dockerId, instanceState, labels, traefikHost))
     val instanceId = Await.result(addFuture, Duration.Inf)
 
     log.info(s"Added instance ${instance.name} with id $instanceId to database.")
@@ -83,9 +84,10 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
       val port = instance.portNumber
       val dockerId = instance.dockerId
       val instanceState = instance.instanceState.toString
+      val traefikHost = instance.traefikConfiguration.map(_.hostName)
 
-      val q = for {i <- instances if i.id === instance.id.get} yield (i.host, i.portNumber, i.dockerId, i.instanceState)
-      Await.result(db.run(q.update(host, port, dockerId, instanceState)), Duration.Inf)
+      val q = for {i <- instances if i.id === instance.id.get} yield (i.host, i.portNumber, i.dockerId, i.instanceState, i.traefikHostName)
+      Await.result(db.run(q.update(host, port, dockerId, instanceState, traefikHost)), Duration.Inf)
       Success()
     } else {
       Failure(new RuntimeException(s"Id ${instance.id.get} not found."))
@@ -390,14 +392,27 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
     listItems.split(",").toList
   }
 
-  private def dataToObjectInstance(options : Option[(Long, String, Long, String, String, Option[String], String, String)]): Instance = {
+  private def dataToObjectInstance(options : Option[(Long, String, Long, String, String, Option[String], String, String, Option[String])]): Instance = {
     val optionValue = options.get
     val componentTypeObj = getComponentTypeFromString(optionValue._5)
     val instanceStateObj = getInstanceStateFromString(optionValue._7)
     val labelsList = getListFromString(optionValue._8)
     val linksTo = getLinksTo(optionValue._1)
     val LinksFrom = getLinksFrom(optionValue._1)
-    Instance.apply(Option(optionValue._1), optionValue._2, optionValue._3, optionValue._4, componentTypeObj, optionValue._6, instanceStateObj, labelsList, linksTo, LinksFrom)
+
+    val traefikConfig = optionValue._9.map(host => TraefikConfiguration(host, configuration.traefikUri))
+
+    Instance(Option(optionValue._1),
+      optionValue._2,
+      optionValue._3,
+      optionValue._4,
+      componentTypeObj,
+      optionValue._6,
+      instanceStateObj,
+      labelsList,
+      linksTo,
+      LinksFrom,
+      traefikConfig)
   }
 
   private def removeInstancesWithId(id: Long): Unit ={
diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DynamicInstanceDAO.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DynamicInstanceDAO.scala
@@ -36,7 +36,7 @@ class DynamicInstanceDAO (configuration : Configuration) extends InstanceDAO wit
     val id = nextId()
 
     val newInstance = Instance(Some(id), instance.host, instance.portNumber, instance.name, instance.componentType,
-      instance.dockerId, instance.instanceState,instance.labels, instance.linksTo, instance.linksFrom)
+      instance.dockerId, instance.instanceState,instance.labels, instance.linksTo, instance.linksFrom, instance.traefikConfiguration)
     instances.add(newInstance)
     instanceMatchingResults.put(newInstance.id.get, mutable.MutableList())
     instanceEvents.put(newInstance.id.get, mutable.MutableList())
@@ -164,7 +164,8 @@ class DynamicInstanceDAO (configuration : Configuration) extends InstanceDAO wit
         state,
         instance.labels,
         instance.linksTo,
-        instance.linksFrom)
+        instance.linksFrom,
+        instance.traefikConfiguration)
       instances filter {i => i.id == instance.id} map instances.remove
       instances.add(newInstance)
       Success()
@@ -193,7 +194,8 @@ class DynamicInstanceDAO (configuration : Configuration) extends InstanceDAO wit
             instance.instanceState,
             instance.labels ++ List[String](label),
             instance.linksTo,
-            instance.linksFrom)
+            instance.linksFrom,
+            instance.traefikConfiguration)
           instances filter {i => i.id == instance.id} map instances.remove
           instances.add(newInstance)
           Success()
@@ -292,7 +294,8 @@ class DynamicInstanceDAO (configuration : Configuration) extends InstanceDAO wit
       instance.instanceState,
       instance.labels,
       linksTo,
-      linksFrom
+      linksFrom,
+      instance.traefikConfiguration
     )
   }
 
diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/Tables.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/Tables.scala
@@ -6,7 +6,7 @@ import slick.jdbc.MySQLProfile
 import slick.jdbc.MySQLProfile.api._
 import slick.sql.SqlProfile.ColumnOption.{NotNull, SqlType}
 
-class Instances(tag: Tag) extends Table[(Long, String, Long, String, String, Option[String], String, String)](tag, "instances") {
+class Instances(tag: Tag) extends Table[(Long, String, Long, String, String, Option[String], String, String, Option[String])](tag, "instances") {
   def id = column[Long]("id", O.PrimaryKey, O.AutoInc) // This is the primary key column
   def host = column[String]("host", O.Length(255), NotNull)
   def portNumber = column[Long]("portNumber", NotNull)
@@ -17,7 +17,9 @@ class Instances(tag: Tag) extends Table[(Long, String, Long, String, String, Opt
   def instanceState = column[String]("instanceState", O.Length(50), NotNull)
   def labels = column[String]("labels", O.Length(255), NotNull)
 
-  def * = (id, host, portNumber, name, componentType, dockerId, instanceState, labels)
+  def traefikHostName = column[Option[String]]("traefikHostName", O.Length(255), O.Default(None))
+
+  def * = (id, host, portNumber, name, componentType, dockerId, instanceState, labels, traefikHostName)
 }
 
 class InstanceMatchingResults(tag: Tag) extends Table[(Long, Long, Boolean)](tag, "instance_matching_results") {
diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/io/swagger/client/model/Instance.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/io/swagger/client/model/Instance.scala
@@ -68,8 +68,10 @@ trait InstanceJsonSupport extends SprayJsonSupport with DefaultJsonProtocol with
     }
   }
 
+  //JSON format for traefik config information
+  implicit val traefikConfigFormat : JsonFormat[TraefikConfiguration] = jsonFormat2(TraefikConfiguration)
   //JSON format for Instances
-  implicit val instanceFormat : JsonFormat[Instance] = jsonFormat10(Instance)
+  implicit val instanceFormat : JsonFormat[Instance] = jsonFormat11(Instance)
 }
 
 /**
@@ -92,9 +94,17 @@ final case class Instance (
                             instanceState: InstanceState,
                             labels: List[String],
                             linksTo: List[InstanceLink],
-                            linksFrom: List[InstanceLink]
+                            linksFrom: List[InstanceLink],
+                            traefikConfiguration: Option[TraefikConfiguration] = None
 )
 
+/**
+  * The connection information regarding the Traefik reverse-proxy setup
+  * @param hostName DNS host name that has been assigned to this instance
+  * @param proxyUri URI that the Traefik reverse-proxy is running at
+  */
+final case class TraefikConfiguration (hostName: String, proxyUri: String)
+
 /**
   * Enumerations concerning instances
   */
