Move tosca library test data under translator tests

Move TOSCA library data to the translator tests and remove toscalib folder.

Partially Implements: blueprint use-tosca-parser-library

Change-Id: Ib2a9283d2c4ebb6f8ae1e380700491c904843cce

translator/common/utils.py

@@ -225,7 +225,6 @@ class TranslationUtils(object):
             os.path.dirname(os.path.abspath(__file__)), tosca_file)
         expected_hot_tpl = os.path.join(
             os.path.dirname(os.path.abspath(__file__)), hot_file)
-
         tosca = ToscaTemplate(tosca_tpl, params)
         translate = translator.hot.tosca_translator.TOSCATranslator(tosca,
                                                                     params)

translator/hot/tests/test_translate_outputs.py

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

translator/tests/test_template.py

@@ -23,7 +23,7 @@ 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")
+        "../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

@@ -19,8 +19,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_single_server(self):
         tosca_file = \
-            '../toscalib/tests/data/tosca_single_server.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/hot_single_server.yaml'
+            '../tests/data/tosca_single_server.yaml'
+        hot_file = '../tests/data/hot_output/hot_single_server.yaml'
         params = {'cpus': 1}
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
                                                                    hot_file,
@@ -30,8 +30,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_wordpress_single_instance(self):
         tosca_file = \
-            '../toscalib/tests/data/tosca_single_instance_wordpress.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/' \
+            '../tests/data/tosca_single_instance_wordpress.yaml'
+        hot_file = '../tests/data/hot_output/' \
             'hot_single_instance_wordpress.yaml'
         params = {'db_name': 'wordpress',
                   'db_user': 'wp_user',
@@ -47,8 +47,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_helloworld(self):
         tosca_file = \
-            '../toscalib/tests/data/tosca_helloworld.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/' \
+            '../tests/data/tosca_helloworld.yaml'
+        hot_file = '../tests/data/hot_output/' \
             'hot_tosca_helloworld.yaml'
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
                                                                    hot_file,
@@ -58,8 +58,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_host_assignment(self):
         tosca_file = \
-            '../toscalib/tests/data/test_host_assignment.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/' \
+            '../tests/data/test_host_assignment.yaml'
+        hot_file = '../tests/data/hot_output/' \
             'hot_host_assignment.yaml'
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
                                                                    hot_file,
@@ -69,8 +69,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_elk(self):
         tosca_file = \
-            '../toscalib/tests/data/tosca_elk.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/hot_elk.yaml'
+            '../tests/data/tosca_elk.yaml'
+        hot_file = '../tests/data/hot_output/hot_elk.yaml'
         params = {'github_url':
                   'http://github.com/paypal/rest-api-sample-app-nodejs.git',
                   'my_cpus': 4}
@@ -82,8 +82,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_nodejs_mongodb_two_instances(self):
         tosca_file = \
-            '../toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/' \
+            '../tests/data/tosca_nodejs_mongodb_two_instances.yaml'
+        hot_file = '../tests/data/hot_output/' \
                    'hot_nodejs_mongodb_two_instances.yaml'
         params = {'github_url':
                   'http://github.com/paypal/rest-api-sample-app-nodejs.git',
@@ -96,9 +96,9 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_blockstorage_with_attachment(self):
         tosca_file = \
-            '../toscalib/tests/data/storage/' \
+            '../tests/data/storage/' \
             'tosca_blockstorage_with_attachment.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file = '../tests/data/hot_output/storage/' \
                    'hot_blockstorage_with_attachment.yaml'
         params = {'cpus': 1,
                   'storage_location': '/dev/vdc',
@@ -112,9 +112,9 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_blockstorage_with_custom_relationship_type(self):
         tosca_file = \
-            '../toscalib/tests/data/storage/' \
+            '../tests/data/storage/' \
             'tosca_blockstorage_with_custom_relationship_type.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file = '../tests/data/hot_output/storage/' \
                    'hot_blockstorage_with_custom_relationship_type.yaml'
         params = {'cpus': 1,
                   'storage_location': '/dev/vdc',
@@ -128,9 +128,9 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_blockstorage_with_relationship_template(self):
         tosca_file = \
-            '../toscalib/tests/data/storage/' \
+            '../tests/data/storage/' \
             'tosca_blockstorage_with_relationship_template.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file = '../tests/data/hot_output/storage/' \
                    'hot_blockstorage_with_relationship_template.yaml'
         params = {'cpus': 1,
                   'storage_location': '/dev/vdc',
@@ -143,11 +143,11 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_blockstorage_with_attachment_notation1(self):
         tosca_file = \
-            '../toscalib/tests/data/storage/' \
+            '../tests/data/storage/' \
             'tosca_blockstorage_with_attachment_notation1.yaml'
-        hot_file1 = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file1 = '../tests/data/hot_output/storage/' \
                     'hot_blockstorage_with_attachment_notation1_alt1.yaml'
-        hot_file2 = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file2 = '../tests/data/hot_output/storage/' \
                     'hot_blockstorage_with_attachment_notation1_alt2.yaml'
         params = {'cpus': 1,
                   'storage_location': 'some_folder',
@@ -169,11 +169,11 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_blockstorage_with_attachment_notation2(self):
         tosca_file = \
-            '../toscalib/tests/data/storage/' \
+            '../tests/data/storage/' \
             'tosca_blockstorage_with_attachment_notation2.yaml'
-        hot_file1 = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file1 = '../tests/data/hot_output/storage/' \
                     'hot_blockstorage_with_attachment_notation2_alt1.yaml'
-        hot_file2 = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file2 = '../tests/data/hot_output/storage/' \
                     'hot_blockstorage_with_attachment_notation2_alt2.yaml'
         params = {'cpus': 1,
                   'storage_location': '/dev/vdc',
@@ -195,11 +195,11 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_multiple_blockstorage_with_attachment(self):
         tosca_file = \
-            '../toscalib/tests/data/storage/' \
+            '../tests/data/storage/' \
             'tosca_multiple_blockstorage_with_attachment.yaml'
-        hot_file1 = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file1 = '../tests/data/hot_output/storage/' \
                     'hot_multiple_blockstorage_with_attachment_alt1.yaml'
-        hot_file2 = '../toscalib/tests/data/hot_output/storage/' \
+        hot_file2 = '../tests/data/hot_output/storage/' \
                     'hot_multiple_blockstorage_with_attachment_alt2.yaml'
         params = {'cpus': 1,
                   'storage_location': '/dev/vdc',
@@ -221,8 +221,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_single_object_store(self):
         tosca_file = \
-            '../toscalib/tests/data/storage/tosca_single_object_store.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/' \
+            '../tests/data/storage/tosca_single_object_store.yaml'
+        hot_file = '../tests/data/hot_output/' \
                    'hot_single_object_store.yaml'
         params = {'objectstore_name': 'myobjstore'}
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
@@ -233,8 +233,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_one_server_one_network(self):
         tosca_file = \
-            '../toscalib/tests/data/network/tosca_one_server_one_network.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/network/' \
+            '../tests/data/network/tosca_one_server_one_network.yaml'
+        hot_file = '../tests/data/hot_output/network/' \
                    'hot_one_server_one_network.yaml'
         params = {'network_name': 'private_net'}
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
@@ -244,9 +244,9 @@ class ToscaHotTranslationTest(TestCase):
                          json.dumps(diff, indent=4, separators=(', ', ': ')))
 
     def test_hot_translate_server_on_existing_network(self):
-        tosca_file = '../toscalib/tests/data/network/' \
+        tosca_file = '../tests/data/network/' \
                      'tosca_server_on_existing_network.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/network/' \
+        hot_file = '../tests/data/hot_output/network/' \
                    'hot_server_on_existing_network.yaml'
         params = {'network_name': 'private_net'}
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
@@ -257,8 +257,8 @@ class ToscaHotTranslationTest(TestCase):
 
     def test_hot_translate_two_servers_one_network(self):
         tosca_file = \
-            '../toscalib/tests/data/network/tosca_two_servers_one_network.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/network/' \
+            '../tests/data/network/tosca_two_servers_one_network.yaml'
+        hot_file = '../tests/data/hot_output/network/' \
                    'hot_two_servers_one_network.yaml'
         params = {'network_name': 'my_private_net',
                   'network_cidr': '10.0.0.0/24',
@@ -271,9 +271,9 @@ class ToscaHotTranslationTest(TestCase):
                          json.dumps(diff, indent=4, separators=(', ', ': ')))
 
     def test_hot_translate_one_server_three_networks(self):
-        tosca_file = '../toscalib/tests/data/network/' \
+        tosca_file = '../tests/data/network/' \
                      'tosca_one_server_three_networks.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/network/' \
+        hot_file = '../tests/data/hot_output/network/' \
                    'hot_one_server_three_networks.yaml'
         params = {}
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
@@ -283,8 +283,8 @@ class ToscaHotTranslationTest(TestCase):
                          json.dumps(diff, indent=4, separators=(', ', ': ')))
 
     def test_hot_translate_software_component(self):
-        tosca_file = '../toscalib/tests/data/tosca_software_component.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/' \
+        tosca_file = '../tests/data/tosca_software_component.yaml'
+        hot_file = '../tests/data/hot_output/' \
                    'hot_software_component.yaml'
         params = {'cpus': '1',
                   'download_url': 'http://www.software.com/download'}
@@ -295,8 +295,8 @@ class ToscaHotTranslationTest(TestCase):
                          json.dumps(diff, indent=4, separators=(', ', ': ')))
 
     def test_hot_translate_web_application(self):
-        tosca_file = '../toscalib/tests/data/tosca_web_application.yaml'
-        hot_file = '../toscalib/tests/data/hot_output/hot_web_application.yaml'
+        tosca_file = '../tests/data/tosca_web_application.yaml'
+        hot_file = '../tests/data/hot_output/hot_web_application.yaml'
         params = {'cpus': '2', 'context_root': 'my_web_app'}
         diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file,
                                                                    hot_file,

translator/tests/test_utils.py

@@ -172,7 +172,7 @@ class CommonUtilsTest(TestCase):
     def test_yamlutils_get_dict(self):
         yaml_file = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            '../toscalib/tests/data/custom_types/rsyslog.yaml')
+            '../tests/data/custom_types/rsyslog.yaml')
         dict = \
             {'tosca_definitions_version': 'tosca_simple_yaml_1_0',
              'description':
@@ -190,10 +190,10 @@ class CommonUtilsTest(TestCase):
     def test_yamlutils_compare_yamls(self):
         yaml_file1 = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            '../toscalib/tests/data/custom_types/kibana.yaml')
+            '../tests/data/custom_types/kibana.yaml')
         yaml_file2 = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            '../toscalib/tests/data/custom_types/collectd.yaml')
+            '../tests/data/custom_types/collectd.yaml')
         self.assertEqual(True,
                          self.yamlUtils.compare_yamls(yaml_file1, yaml_file1))
         self.assertEqual(False,
@@ -202,10 +202,10 @@ class CommonUtilsTest(TestCase):
     def test_yamlutils_compare_yaml_dict(self):
         yaml_file1 = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            '../toscalib/tests/data/custom_types/rsyslog.yaml')
+            '../tests/data/custom_types/rsyslog.yaml')
         yaml_file2 = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            '../toscalib/tests/data/custom_types/collectd.yaml')
+            '../tests/data/custom_types/collectd.yaml')
         dict = \
             {'tosca_definitions_version': 'tosca_simple_yaml_1_0',
              'description':