From f2608a088417479b2c240ef838e7b2f1f2b76a2b Mon Sep 17 00:00:00 2001 From: spzala Date: Sat, 2 May 2015 07:07:02 -0700 Subject: [PATCH] TOSCA: rename sample template file Sample TOSCA templates are now stored to one location. Move this left over file. Change-Id: I6cee56addd5699907f063d18f14fbb5c6debc6e2 --- translator/tests/test_translated_output_order.py | 8 ++++---- .../tests/data/hot_output/hot_single_server.yaml | 0 .../{ => toscalib}/tests/data/tosca_single_server.yaml | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename translator/{ => toscalib}/tests/data/hot_output/hot_single_server.yaml (100%) rename translator/{ => toscalib}/tests/data/tosca_single_server.yaml (100%) diff --git a/translator/tests/test_translated_output_order.py b/translator/tests/test_translated_output_order.py index 2c803dd2..5a37a312 100644 --- a/translator/tests/test_translated_output_order.py +++ b/translator/tests/test_translated_output_order.py @@ -21,20 +21,20 @@ from translator.toscalib.tosca_template import ToscaTemplate class ToscaTemplateOutputOrderTest(TestCase): def test_translate_output_order(self): - tosca_yaml_file = "data/tosca_single_server.yaml" + tosca_yaml = "../toscalib/tests/data/tosca_single_server.yaml" tosca_tpl = os.path.join( os.path.dirname(os.path.abspath(__file__)), - tosca_yaml_file) + tosca_yaml) parsed_params = {'cpus': 2} tosca = ToscaTemplate(tosca_tpl) translate = TOSCATranslator(tosca, parsed_params) hot_translated_output = translate.translate() # load expected hot yaml file - hot_yaml_file = "data/hot_output/hot_single_server.yaml" + hot_yaml = "../toscalib/tests/data/hot_output/hot_single_server.yaml" hot_tpl = os.path.join( os.path.dirname(os.path.abspath(__file__)), - hot_yaml_file) + hot_yaml) with open(hot_tpl) as f: hot_expected_output = f.read() diff --git a/translator/tests/data/hot_output/hot_single_server.yaml b/translator/toscalib/tests/data/hot_output/hot_single_server.yaml similarity index 100% rename from translator/tests/data/hot_output/hot_single_server.yaml rename to translator/toscalib/tests/data/hot_output/hot_single_server.yaml diff --git a/translator/tests/data/tosca_single_server.yaml b/translator/toscalib/tests/data/tosca_single_server.yaml similarity index 100% rename from translator/tests/data/tosca_single_server.yaml rename to translator/toscalib/tests/data/tosca_single_server.yaml