Merge "Enable Translator with new TOSCA library (4)"

translator/hot/tests/test_translate_outputs.py

@@ -21,9 +21,8 @@ class ToscaTemplateOutputTest(TestCase):
 
     def test_translate_output(self):
         tosca_tpl = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)),
-            "../../toscalib/tests/data/"
-            "tosca_nodejs_mongodb_two_instances.yaml")
+            os.path.dirname(os.path.abspath(toscaparser.__file__)),
+            "tests/data/", "tosca_nodejs_mongodb_two_instances.yaml")
         tosca = ToscaTemplate(tosca_tpl)
         translate = TOSCATranslator(tosca, [])
         hot_translation = translate.translate()

translator/tests/test_template.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import os
+import toscaparser
 from toscaparser.tosca_template import ToscaTemplate
 from translator.tests.base import TestCase
 
@@ -22,8 +23,8 @@ class ToscaMongoNodejsTest(TestCase):
 
     '''TOSCA template with nodejs, app and mongodb on 2 servers.'''
     tosca_tpl = os.path.join(
-        os.path.dirname(os.path.abspath(__file__)),
-        "../toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml")
+        os.path.dirname(os.path.abspath(toscaparser.__file__)),
+        "tests/data/", "tosca_nodejs_mongodb_two_instances.yaml")
     tosca = ToscaTemplate(tosca_tpl, parsed_params)
 
     def test_relationship_def(self):

translator/tests/test_tosca_hot_translation.py

@@ -11,6 +11,8 @@
 #    under the License.
 
 import json
+import os
+import toscaparser
 from translator.common.utils import TranslationUtils
 from translator.tests.base import TestCase
 
@@ -81,8 +83,9 @@ class ToscaHotTranslationTest(TestCase):
                          json.dumps(diff, indent=4, separators=(', ', ': ')))
 
     def test_hot_translate_nodejs_mongodb_two_instances(self):
-        tosca_file = \
-            '../toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml'
+        tosca_file = os.path.join(
+            os.path.dirname(os.path.abspath(toscaparser.__file__)),
+            "tests/data/", "tosca_nodejs_mongodb_two_instances.yaml")
         hot_file = '../toscalib/tests/data/hot_output/' \
                    'hot_nodejs_mongodb_two_instances.yaml'
         params = {'github_url':

translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml

@@ -1,96 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  TOSCA simple profile with nodejs and mongodb.
-
-imports:
-  - custom_types/paypalpizzastore_nodejs_app.yaml
-
-dsl_definitions:
-  host_capabilities: &host_capabilities
-    disk_size: 10 GB
-    num_cpus: 1
-    mem_size: 4096 MB
-  os_capabilities: &os_capabilities
-    architecture: x86_64
-    type: Linux
-    distribution: Ubuntu
-    version: 14.04
-
-topology_template:
-  inputs:
-    my_cpus:
-      type: integer
-      description: Number of CPUs for the server.
-      constraints:
-        - valid_values: [ 1, 2, 4, 8 ]
-      default: 1
-    github_url:
-       type: string
-       description: The URL to download nodejs.
-       default: http://github.com/paypal/rest-api-sample-app-nodejs.git
-
-  node_templates:
-    paypal_pizzastore:
-      type: tosca.nodes.WebApplication.PayPalPizzaStore
-      properties:
-          github_url: { get_input: github_url }
-      requirements:
-        - host: nodejs
-        - database_connection: mongo_db
-      interfaces:
-        Standard:
-           configure:
-             implementation: nodejs/config.sh
-             inputs:
-               github_url: http://github.com/paypal/rest-api-sample-app-nodejs.git
-               mongodb_ip: { get_attribute: [mongo_server, private_address] }
-           start: nodejs/start.sh
-    nodejs:
-      type: tosca.nodes.WebServer
-      requirements:
-        - host: app_server
-      interfaces:
-        Standard:
-          create: nodejs/create.sh
-    mongo_db:
-      type: tosca.nodes.Database
-      requirements:
-        - host: mongo_dbms
-      interfaces:
-        Standard:
-          create: mongodb/create_database.sh
-    mongo_dbms:
-      type: tosca.nodes.DBMS
-      requirements:
-        - host: mongo_server
-      interfaces:
-        Standard:
-          create: mongodb/create.sh
-          configure:
-            implementation: mongodb/config.sh
-            inputs:
-              mongodb_ip: { get_attribute: [mongo_server, private_address] }
-          start: mongodb/start.sh
-    mongo_server:
-      type: tosca.nodes.Compute
-      capabilities:
-        host:
-          properties: *host_capabilities
-        os:
-          properties: *os_capabilities
-    app_server:
-      type: tosca.nodes.Compute
-      capabilities:
-        host:
-          properties: *host_capabilities
-        os:
-          properties: *os_capabilities
-
-  outputs:
-    nodejs_url:
-      description: URL for the nodejs server, http://<IP>:3000
-      value: { get_attribute: [app_server, private_address] }
-    mongodb_url:
-      description: URL for the mongodb server.
-      value: { get_attribute: [mongo_server, private_address] }