Merge branch 'master' into 'master'

Ganjusev Timofei is adding his first service template and homework template

See merge request dehury/radon-particles!25

servicetemplates/example.org.tosca.servicetemplates/myApacheService_ganjusev_w1-wip1/README.md

+My nginx application from previous lab.
\ No newline at end of file

servicetemplates/example.org.tosca.servicetemplates/myApacheService_ganjusev_w1-wip1/ServiceTemplate.tosca

+tosca_definitions_version: tosca_simple_yaml_1_3
+
+metadata:
+  targetNamespace: "example.org.tosca.servicetemplates"
+topology_template:
+  node_templates:
+    containerNginx_0:
+      type: radon.nodes.docker.containerNginx
+      metadata:
+        x: "1062"
+        y: "294"
+        displayName: "containerNginx_ganjusev"
+      properties:
+        container_port: "80"
+        image_name: "tymoj/nginx-alpine"
+        container_name: "my-nginx-alpine"
+        host_port: "8085"
+      requirements:
+        - host:
+            node: DockerEngineUT_0
+            relationship: con_HostedOn_1
+            capability: host
+    RemoteWorkstation_0:
+      type: radon.nodes.VM.RemoteWorkstation
+      metadata:
+        x: "413"
+        y: "331"
+        displayName: "RemoteWorkstation"
+      properties:
+        ssh_username: "centos"
+        KeyFile: "/home/ubuntu/id_rsa"
+        external_ip: "172.17.91.49"
+    DockerEngineUT_0:
+      type: radon.nodes.docker.DockerEngineUT
+      metadata:
+        x: "722"
+        y: "317"
+        displayName: "DockerEngineUT"
+      requirements:
+        - host:
+            node: RemoteWorkstation_0
+            relationship: con_HostedOn_0
+            capability: host
+  relationship_templates:
+    con_HostedOn_0:
+      type: tosca.relationships.HostedOn
+    con_HostedOn_1:
+      type: tosca.relationships.HostedOn

servicetemplates/radon.blueprints.examples/myfirstTOSCAappshiva/README.md

-My first TOSCA application
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myfirstToscaApp_ganjusev/README.md

+Simple nginx app created in winery. idk
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myfirstToscaApp_ganjusev/README.md.mimetype

+text/plain
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myfirstTOSCAappshiva/ServiceTemplate.tosca → servicetemplates/radon.blueprints.examples/myfirstToscaApp_ganjusev/ServiceTemplate.tosca

@@ -7,14 +7,14 @@ topology_template:
     containerNginx_0:
       type: radon.nodes.docker.containerNginx
       metadata:
-        x: "381"
-        y: "109"
-        displayName: "containerNginx"
+        x: "1047"
+        y: "231"
+        displayName: "defaultNginxServer_ganjusev"
       properties:
-        container_port: 80
+        container_port: "80"
         image_name: "nginx:1.13"
         container_name: "mynginxserver"
-        host_port: 8082
+        host_port: "8082"
       requirements:
         - host:
             node: DockerEngineUT_0
@@ -23,18 +23,18 @@ topology_template:
     RemoteWorkstation_0:
       type: radon.nodes.VM.RemoteWorkstation
       metadata:
-        x: "959"
-        y: "210"
+        x: "368"
+        y: "269"
         displayName: "RemoteWorkstation"
       properties:
         ssh_username: "centos"
-        KeyFile: "/home/ubuntu/etais"
-        external_ip: "172.17.90.104"
+        KeyFile: "/home/ubuntu/id_rsa"
+        external_ip: "172.17.91.49"
     DockerEngineUT_0:
       type: radon.nodes.docker.DockerEngineUT
       metadata:
-        x: "654"
-        y: "305"
+        x: "702"
+        y: "248"
         displayName: "DockerEngineUT"
       requirements:
         - host: