From 2131e757e63c5b8b13cf5443b2c9de03e2993052 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 21 Oct 2021 13:09:47 +0200 Subject: [PATCH] Fix TOSCA Configure interface --- test/files/tosca_long.yml | 11 +---------- test/unit/Tosca.py | 2 ++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/test/files/tosca_long.yml b/test/files/tosca_long.yml index 1193ba375..77f9af03f 100644 --- a/test/files/tosca_long.yml +++ b/test/files/tosca_long.yml @@ -101,18 +101,9 @@ topology_template: - local_storage: node: my_onedata_storage relationship: - type: AttachesTo + type: tosca.relationships.indigo.OneDataStorage.AttachesTo properties: location: /mnt/disk - interfaces: - Configure: - pre_configure_source: - implementation: - file: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/artifacts/onedata/oneclient_install.yml - type: tosca.artifacts.Implementation.YAML - inputs: - onedata_token: { get_property: [ TARGET, credential, token ] } - onedata_location: { get_property: [ SELF, location ] } my_onedata_storage: type: tosca.nodes.indigo.OneDataStorage diff --git a/test/unit/Tosca.py b/test/unit/Tosca.py index 0945bb64c..32e5b9a28 100755 --- a/test/unit/Tosca.py +++ b/test/unit/Tosca.py @@ -93,6 +93,8 @@ def test_tosca_to_radl(self): "{{ groups['lrms_wn']|map('extract', hostvars,'IM_NODE_PRIVATE_IP')|list" " if 'lrms_wn' in groups else []}}") self.assertEqual([d.id for d in radl.deploys][2], 'lrms_wn') + att_conf = radl.get_configure_by_name('lrms_server_tosca.relationships.indigo.onedatastorage.attachesto_conf') + conf = yaml.safe_load(att_conf.recipes)[0] def test_tosca_get_outputs(self): """Test TOSCA get_outputs function"""