resolve conflicts

TOSCA/lifeWatch_vre1.yaml

+tosca_definitions_version: tosca_simple_yaml_1_0
+description: TOSCA example
+imports:
+<<<<<<< HEAD
+  - nodes: https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/nodes.yaml
+  - data: https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/data.yml
+  - capabilities: https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/capabilities.yaml
+  - policies: https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/policies.yaml
+  - interfaces: https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/interfaces.yml
+  
+repositories:
+  docker_hub: https://hub.docker.com/  
+
+description: >
+  TOSCA example
+  
+topology_template:
+  node_templates:
+
+
+
+    #topology:
+      #interfaces:
+        #CloudsStorm:
+          #provision:
+            #inputs:
+              #code_type: SEQ
+              #object_type: SubTopology
+      #properties:
+        #domain: UvA (Amsterdam, The Netherlands) XO Rack
+        #provider: ExoGENI
+      #type: tosca.nodes.ARTICONF.VM.topology
+
+          
+    ws-pema-lifewatch:
+        type: tosca.nodes.ARTICONF.Container.Application.Docker
+        properties:
+            ports: 
+            - "30001:8080"   
+        artifacts:
+            image:
+                type: tosca.artifacts.Deployment.Image.Container.Docker
+                file:  alogo53/ws-pema-lifewatch
+                repository: docker_hub      
+        requirements:
+        - host:
+            capability: tosca.capabilities.ARTICONF.docker.Orchestrator
+            node: kubernetes
+            relationship: tosca.relationships.HostedOn
+          
+          
+    kubernetes:
+        type: tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes
+        properties:
+            min_masters_num: 1
+            min_workers_num: 1
+        interfaces:
+            Kubernetes:
+                create:
+                    inputs:
+                        playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/create_k8s.yml"
+                install:
+                    inputs:
+                        playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/install_k8s.yml"
+      
+    #topology:
+        #type: tosca.nodes.ARTICONF.VM.topology
+        #properties:
+            #domain: "UvA (Amsterdam, The Netherlands) XO Rack"
+            #provider: "ExoGENI"
+        #interfaces:
+            #CloudsStorm:
+                #provision:
+                    #inputs:
+                        #code_type: "SEQ"
+                        #object_type: "SubTopology"

openAPI/schema/TOSCA/NodeTemplate.yml

@@ -36,7 +36,7 @@
           artifacts:
               type: object
               additionalProperties:
-                  type: object                               
+                  type: object            
 
      
  

sure_tosca-flask-server/requirements.txt

+werkzeug==1.0.0
 PyYAML
-wheel==0.33.6
-connexion == 2.4.0
-python-dateutil == 2.8.0
-typing == 3.7.4.1
-swagger-ui-bundle == 0.0.5
-tinydb == 3.15.1
-tosca-parser ==1.6.1
+wheel==0.34.2
+connexion==2.6.0
+python-dateutil==2.8.1
+typing==3.7.4.1
+swagger-ui-bundle==0.0.6
+# tinydb==3.15.1
+tosca-parser ==1.7.0
+
+
+

sure_tosca-flask-server/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import setup, find_packages
 
 NAME = "sure_tosca"
-VERSION = "1.0.0"
+VERSION = "1.2.0"
 
 # To install the library, run the following
 #

sure_tosca-flask-server/sure_tosca/__main__.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import connexion
 

sure_tosca-flask-server/sure_tosca/models/__init__.py

@@ -6,4 +6,4 @@ from __future__ import absolute_import
 from sure_tosca.models.node_template import NodeTemplateModel
 from sure_tosca.models.node_template_map import NodeTemplateMapModel
 from sure_tosca.models.topology_template import TopologyTemplateModel
-from sure_tosca.models.tosca_template import ToscaTemplateModel
+from sure_tosca.models.tosca_template import ToscaTemplateModel
\ No newline at end of file

sure_tosca-flask-server/sure_tosca/service/tosca_type_service.py

+from sure_tosca.models.node_template import NodeTemplateModel  # noqa: E501
+from sure_tosca.models.node_template_map import NodeTemplateMapModel  # noqa: E501
+from sure_tosca.models.tosca_template import ToscaTemplateModel  # noqa: E501
+
+def add_type_definition(definition_map):
+    return None
+
+
+def get_types(query):
+    return None
\ No newline at end of file

sure_tosca-flask-server/test-requirements.txt

@@ -4,4 +4,4 @@ coverage==5.0.3
 nose>=1.3.7
 pluggy>=0.13.1
 randomize>=0.14
-Werkzeug==0.16.1
+werkzeug==1.0.0
\ No newline at end of file