Merge branch 'docker-in-definition' into 'master'

Docker in definition

See merge request !5

Pipfile.lock

@@ -23,10 +23,10 @@
     "default": {
         "kypo-topology-definition": {
             "hashes": [
-                "sha256:b88773ebb200bece4ed3c7330d1d64643f45f3faccacd60d952272c15cf5779d"
+                "sha256:63979b6ace1abc4168a0d68beb6b61ea5361d0bee71c26f4e66489c2493191cb"
             ],
             "index": "kypo",
-            "version": "==0.5.2"
+            "version": "==0.5.3"
         },
         "netaddr": {
             "hashes": [
@@ -45,13 +45,17 @@
         },
         "ruamel.yaml.clib": {
             "hashes": [
+                "sha256:066f886bc90cc2ce44df8b5f7acfc6a7e2b2e672713f027136464492b0c34d7c",
                 "sha256:0847201b767447fc33b9c235780d3aa90357d20dd6108b92be544427bea197dd",
                 "sha256:1070ba9dd7f9370d0513d649420c3b362ac2d687fe78c6e888f5b12bf8bc7bee",
                 "sha256:1866cf2c284a03b9524a5cc00daca56d80057c5ce3cdc86a52020f4c720856f0",
+                "sha256:1b4139a6ffbca8ef60fdaf9b33dec05143ba746a6f0ae0f9d11d38239211d335",
+                "sha256:210c8fcfeff90514b7133010bf14e3bad652c8efde6b20e00c43854bf94fa5a6",
                 "sha256:221eca6f35076c6ae472a531afa1c223b9c29377e62936f61bc8e6e8bdc5f9e7",
                 "sha256:31ea73e564a7b5fbbe8188ab8b334393e06d997914a4e184975348f204790277",
                 "sha256:3fb9575a5acd13031c57a62cc7823e5d2ff8bc3835ba4d94b921b4e6ee664104",
                 "sha256:4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd",
+                "sha256:61bc5e5ca632d95925907c569daa559ea194a4d16084ba86084be98ab1cec1c6",
                 "sha256:6e7be2c5bcb297f5b82fee9c665eb2eb7001d1050deaba8471842979293a80b0",
                 "sha256:72a2b8b2ff0a627496aad76f37a652bcef400fd861721744201ef1b45199ab78",
                 "sha256:77df077d32921ad46f34816a9a16e6356d8100374579bc35e15bab5d4e9377de",
@@ -67,6 +71,7 @@
                 "sha256:ada3f400d9923a190ea8b59c8f60680c4ef8a4b0dfae134d2f2ff68429adfab5",
                 "sha256:bf75d28fa071645c529b5474a550a44686821decebdd00e21127ef1fd566eabe",
                 "sha256:cfdb9389d888c5b74af297e51ce357b800dd844898af9d4a547ffc143fa56751",
+                "sha256:d3c620a54748a3d4cf0bcfe623e388407c8e85a4b06b8188e126302bcab93ea8",
                 "sha256:d67f273097c368265a7b81e152e07fb90ed395df6e552b9fa858c6d2c9f42502",
                 "sha256:dc6a613d6c74eef5a14a214d433d06291526145431c3b964f5e16529b1842bed",
                 "sha256:de9c6b8a1ba52919ae919f3ae96abb72b994dd0350226e28f3686cb4f142165c"

kypo/cloud_commons/topology_instance.py

@@ -4,7 +4,7 @@ import yaml
 
 from kypo.topology_definition.models \
     import TopologyDefinition, NetworkMappingList, RouterList, RouterMappingList, \
-    Group, Network, Host, Router
+    Group, Network, Host, Router, DockerContainers
 
 from kypo.cloud_commons.transformation_configuration \
     import TransformationConfiguration
@@ -21,8 +21,10 @@ class TopologyInstance:
     """
     Represents a topology instance.
     """
-    def __init__(self, topology_definition: TopologyDefinition, trc: TransformationConfiguration):
+    def __init__(self, topology_definition: TopologyDefinition, trc: TransformationConfiguration,
+                 containers: DockerContainers = None):
         self.topology_definition = topology_definition
+        self.containers = containers
 
         self.name = None
         self.ip = None