Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-258-Convert-runtime-properties-to-attributes 493816b06 -> 78e5e2f57
added set/get testing Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/78e5e2f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/78e5e2f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/78e5e2f5 Branch: refs/heads/ARIA-258-Convert-runtime-properties-to-attributes Commit: 78e5e2f572411d1eaa8cf96f7e7dc1510d18a463 Parents: 493816b Author: max-orlov <ma...@gigaspaces.com> Authored: Thu May 25 14:50:49 2017 +0300 Committer: max-orlov <ma...@gigaspaces.com> Committed: Thu May 25 14:50:49 2017 +0300 ---------------------------------------------------------------------- .../context/test_attribute_suggaring.py | 253 ------------------- .../context/test_collection_instrumentation.py | 253 +++++++++++++++++++ tests/orchestrator/context/test_operation.py | 18 +- 3 files changed, 268 insertions(+), 256 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/78e5e2f5/tests/orchestrator/context/test_attribute_suggaring.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/context/test_attribute_suggaring.py b/tests/orchestrator/context/test_attribute_suggaring.py deleted file mode 100644 index 972c693..0000000 --- a/tests/orchestrator/context/test_attribute_suggaring.py +++ /dev/null @@ -1,253 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import pytest - -from aria.modeling.models import Parameter -from aria.orchestrator.context import common - - -class MockActor(object): - def __init__(self): - self.dict_ = {} - self.list_ = [] - - -class MockModel(object): - - def __init__(self): - self.parameter = type('MockModel', (object, ), {'model_cls': Parameter, - 'put': lambda *args, **kwargs: None, - 'update': lambda *args, **kwargs: None})() - - -class ContextSugaring(object): - - @pytest.fixture - def actor(self): - return MockActor() - - @pytest.fixture - def model(self): - return MockModel() - - @pytest.fixture - def dict_(self, actor, model): - return common._InstrumentedDict(model, actor, 'dict_') - - @pytest.fixture - def list_(self, actor, model): - return common._InstrumentedList(model, actor, 'list_') - - -class TestDict(ContextSugaring): - - def test_keys(self, actor, dict_): - dict_.update( - { - 'key1': Parameter.wrap('key1', 'value1'), - 'key2': Parameter.wrap('key2', 'value2') - } - ) - assert sorted(dict_.keys()) == sorted(['key1', 'key2']) == sorted(actor.dict_.keys()) - - def test_values(self, actor, dict_): - dict_.update({ - 'key1': Parameter.wrap('key1', 'value1'), - 'key2': Parameter.wrap('key1', 'value2') - }) - assert (sorted(dict_.values()) == - sorted(['value1', 'value2']) == - sorted(v.value for v in actor.dict_.values())) - - def test_items(self, dict_): - dict_.update({ - 'key1': Parameter.wrap('key1', 'value1'), - 'key2': Parameter.wrap('key1', 'value2') - }) - assert sorted(dict_.items()) == sorted([('key1', 'value1'), ('key2', 'value2')]) - - def test_iter(self, actor, dict_): - dict_.update({ - 'key1': Parameter.wrap('key1', 'value1'), - 'key2': Parameter.wrap('key1', 'value2') - }) - assert sorted(list(dict_)) == sorted(['key1', 'key2']) == sorted(actor.dict_.keys()) - - def test_bool(self, dict_): - assert not dict_ - dict_.update({ - 'key1': Parameter.wrap('key1', 'value1'), - 'key2': Parameter.wrap('key1', 'value2') - }) - assert dict_ - - def test_set_item(self, actor, dict_): - dict_['key1'] = Parameter.wrap('key1', 'value1') - assert dict_['key1'] == 'value1' == actor.dict_['key1'].value - assert isinstance(actor.dict_['key1'], Parameter) - - def test_nested(self, actor, dict_): - dict_['key'] = {} - assert isinstance(actor.dict_['key'], Parameter) - assert dict_['key'] == actor.dict_['key'].value == {} - - dict_['key']['inner_key'] = 'value' - - assert len(dict_) == 1 - assert 'inner_key' in dict_['key'] - assert dict_['key']['inner_key'] == 'value' - assert dict_['key'].keys() == ['inner_key'] - assert dict_['key'].values() == ['value'] - assert dict_['key'].items() == [('inner_key', 'value')] - assert isinstance(actor.dict_['key'], Parameter) - assert isinstance(dict_['key'], common._InstrumentedDict) - - dict_['key'].update({'updated_key': 'updated_value'}) - assert len(dict_) == 1 - assert 'updated_key' in dict_['key'] - assert dict_['key']['updated_key'] == 'updated_value' - assert sorted(dict_['key'].keys()) == sorted(['inner_key', 'updated_key']) - assert sorted(dict_['key'].values()) == sorted(['value', 'updated_value']) - assert sorted(dict_['key'].items()) == sorted([('inner_key', 'value'), - ('updated_key', 'updated_value')]) - assert isinstance(actor.dict_['key'], Parameter) - assert isinstance(dict_['key'], common._InstrumentedDict) - - dict_.update({'key': 'override_value'}) - assert len(dict_) == 1 - assert 'key' in dict_ - assert dict_['key'] == 'override_value' - assert len(actor.dict_) == 1 - assert isinstance(actor.dict_['key'], Parameter) - assert actor.dict_['key'].value == 'override_value' - - def test_get_item(self, actor, dict_): - dict_['key1'] = Parameter.wrap('key1', 'value1') - assert isinstance(actor.dict_['key1'], Parameter) - - def test_update(self, actor, dict_): - dict_['key1'] = 'value1' - - new_dict = {'key2': 'value2'} - dict_.update(new_dict) - assert len(dict_) == 2 - assert dict_['key2'] == 'value2' - assert isinstance(actor.dict_['key2'], Parameter) - - new_dict = {} - new_dict.update(dict_) - assert new_dict['key1'] == dict_['key1'] - - def test_copy(self, dict_): - dict_['key1'] = 'value1' - - new_dict = dict_.copy() - assert new_dict is not dict_ - assert new_dict == dict_ - - dict_['key1'] = 'value2' - assert new_dict['key1'] == 'value1' - assert dict_['key1'] == 'value2' - - def test_clear(self, dict_): - dict_['key1'] = 'value1' - dict_.clear() - - assert len(dict_) == 0 - - -class TestList(ContextSugaring): - - def test_append(self, actor, list_): - list_.append(Parameter.wrap('name', 'value1')) - list_.append('value2') - assert len(actor.list_) == 2 - assert len(list_) == 2 - assert isinstance(actor.list_[0], Parameter) - assert list_[0] == 'value1' - - assert isinstance(actor.list_[1], Parameter) - assert list_[1] == 'value2' - - list_[0] = 'new_value1' - list_[1] = 'new_value2' - assert isinstance(actor.list_[1], Parameter) - assert isinstance(actor.list_[1], Parameter) - assert list_[0] == 'new_value1' - assert list_[1] == 'new_value2' - - def test_iter(self, list_): - list_.append('value1') - list_.append('value2') - assert sorted(list_) == sorted(['value1', 'value2']) - - def test_insert(self, actor, list_): - list_.append('value1') - list_.insert(0, 'value2') - list_.insert(2, 'value3') - list_.insert(10, 'value4') - assert sorted(list_) == sorted(['value1', 'value2', 'value3', 'value4']) - assert len(actor.list_) == 4 - - def test_set(self, list_): - list_.append('value1') - list_.append('value2') - - list_[1] = 'value3' - assert len(list_) == 2 - assert sorted(list_) == sorted(['value1', 'value3']) - - def test_insert_into_nested(self, actor, list_): - list_.append([]) - - list_[0].append('inner_item') - assert isinstance(actor.list_[0], Parameter) - assert len(list_) == 1 - assert list_[0][0] == 'inner_item' - - list_[0].append('new_item') - assert isinstance(actor.list_[0], Parameter) - assert len(list_) == 1 - assert list_[0][1] == 'new_item' - - assert list_[0] == ['inner_item', 'new_item'] - assert ['inner_item', 'new_item'] == list_[0] - - -class TestDictList(ContextSugaring): - def test_dict_in_list(self, actor, list_): - list_.append({}) - assert len(list_) == 1 - assert isinstance(actor.list_[0], Parameter) - assert actor.list_[0].value == {} - - list_[0]['key'] = 'value' - assert list_[0]['key'] == 'value' - assert len(actor.list_) == 1 - assert isinstance(actor.list_[0], Parameter) - assert actor.list_[0].value['key'] == 'value' - - def test_list_in_dict(self, actor, dict_): - dict_['key'] = [] - assert len(dict_) == 1 - assert isinstance(actor.dict_['key'], Parameter) - assert actor.dict_['key'].value == [] - - dict_['key'].append('value') - assert dict_['key'][0] == 'value' - assert len(actor.dict_) == 1 - assert isinstance(actor.dict_['key'], Parameter) - assert actor.dict_['key'].value[0] == 'value' http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/78e5e2f5/tests/orchestrator/context/test_collection_instrumentation.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/context/test_collection_instrumentation.py b/tests/orchestrator/context/test_collection_instrumentation.py new file mode 100644 index 0000000..e5cde01 --- /dev/null +++ b/tests/orchestrator/context/test_collection_instrumentation.py @@ -0,0 +1,253 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import pytest + +from aria.modeling.models import Parameter +from aria.orchestrator.context import common + + +class MockActor(object): + def __init__(self): + self.dict_ = {} + self.list_ = [] + + +class MockModel(object): + + def __init__(self): + self.parameter = type('MockModel', (object, ), {'model_cls': Parameter, + 'put': lambda *args, **kwargs: None, + 'update': lambda *args, **kwargs: None})() + + +class CollectionInstrumentation(object): + + @pytest.fixture + def actor(self): + return MockActor() + + @pytest.fixture + def model(self): + return MockModel() + + @pytest.fixture + def dict_(self, actor, model): + return common._InstrumentedDict(model, actor, 'dict_') + + @pytest.fixture + def list_(self, actor, model): + return common._InstrumentedList(model, actor, 'list_') + + +class TestDict(CollectionInstrumentation): + + def test_keys(self, actor, dict_): + dict_.update( + { + 'key1': Parameter.wrap('key1', 'value1'), + 'key2': Parameter.wrap('key2', 'value2') + } + ) + assert sorted(dict_.keys()) == sorted(['key1', 'key2']) == sorted(actor.dict_.keys()) + + def test_values(self, actor, dict_): + dict_.update({ + 'key1': Parameter.wrap('key1', 'value1'), + 'key2': Parameter.wrap('key1', 'value2') + }) + assert (sorted(dict_.values()) == + sorted(['value1', 'value2']) == + sorted(v.value for v in actor.dict_.values())) + + def test_items(self, dict_): + dict_.update({ + 'key1': Parameter.wrap('key1', 'value1'), + 'key2': Parameter.wrap('key1', 'value2') + }) + assert sorted(dict_.items()) == sorted([('key1', 'value1'), ('key2', 'value2')]) + + def test_iter(self, actor, dict_): + dict_.update({ + 'key1': Parameter.wrap('key1', 'value1'), + 'key2': Parameter.wrap('key1', 'value2') + }) + assert sorted(list(dict_)) == sorted(['key1', 'key2']) == sorted(actor.dict_.keys()) + + def test_bool(self, dict_): + assert not dict_ + dict_.update({ + 'key1': Parameter.wrap('key1', 'value1'), + 'key2': Parameter.wrap('key1', 'value2') + }) + assert dict_ + + def test_set_item(self, actor, dict_): + dict_['key1'] = Parameter.wrap('key1', 'value1') + assert dict_['key1'] == 'value1' == actor.dict_['key1'].value + assert isinstance(actor.dict_['key1'], Parameter) + + def test_nested(self, actor, dict_): + dict_['key'] = {} + assert isinstance(actor.dict_['key'], Parameter) + assert dict_['key'] == actor.dict_['key'].value == {} + + dict_['key']['inner_key'] = 'value' + + assert len(dict_) == 1 + assert 'inner_key' in dict_['key'] + assert dict_['key']['inner_key'] == 'value' + assert dict_['key'].keys() == ['inner_key'] + assert dict_['key'].values() == ['value'] + assert dict_['key'].items() == [('inner_key', 'value')] + assert isinstance(actor.dict_['key'], Parameter) + assert isinstance(dict_['key'], common._InstrumentedDict) + + dict_['key'].update({'updated_key': 'updated_value'}) + assert len(dict_) == 1 + assert 'updated_key' in dict_['key'] + assert dict_['key']['updated_key'] == 'updated_value' + assert sorted(dict_['key'].keys()) == sorted(['inner_key', 'updated_key']) + assert sorted(dict_['key'].values()) == sorted(['value', 'updated_value']) + assert sorted(dict_['key'].items()) == sorted([('inner_key', 'value'), + ('updated_key', 'updated_value')]) + assert isinstance(actor.dict_['key'], Parameter) + assert isinstance(dict_['key'], common._InstrumentedDict) + + dict_.update({'key': 'override_value'}) + assert len(dict_) == 1 + assert 'key' in dict_ + assert dict_['key'] == 'override_value' + assert len(actor.dict_) == 1 + assert isinstance(actor.dict_['key'], Parameter) + assert actor.dict_['key'].value == 'override_value' + + def test_get_item(self, actor, dict_): + dict_['key1'] = Parameter.wrap('key1', 'value1') + assert isinstance(actor.dict_['key1'], Parameter) + + def test_update(self, actor, dict_): + dict_['key1'] = 'value1' + + new_dict = {'key2': 'value2'} + dict_.update(new_dict) + assert len(dict_) == 2 + assert dict_['key2'] == 'value2' + assert isinstance(actor.dict_['key2'], Parameter) + + new_dict = {} + new_dict.update(dict_) + assert new_dict['key1'] == dict_['key1'] + + def test_copy(self, dict_): + dict_['key1'] = 'value1' + + new_dict = dict_.copy() + assert new_dict is not dict_ + assert new_dict == dict_ + + dict_['key1'] = 'value2' + assert new_dict['key1'] == 'value1' + assert dict_['key1'] == 'value2' + + def test_clear(self, dict_): + dict_['key1'] = 'value1' + dict_.clear() + + assert len(dict_) == 0 + + +class TestList(CollectionInstrumentation): + + def test_append(self, actor, list_): + list_.append(Parameter.wrap('name', 'value1')) + list_.append('value2') + assert len(actor.list_) == 2 + assert len(list_) == 2 + assert isinstance(actor.list_[0], Parameter) + assert list_[0] == 'value1' + + assert isinstance(actor.list_[1], Parameter) + assert list_[1] == 'value2' + + list_[0] = 'new_value1' + list_[1] = 'new_value2' + assert isinstance(actor.list_[1], Parameter) + assert isinstance(actor.list_[1], Parameter) + assert list_[0] == 'new_value1' + assert list_[1] == 'new_value2' + + def test_iter(self, list_): + list_.append('value1') + list_.append('value2') + assert sorted(list_) == sorted(['value1', 'value2']) + + def test_insert(self, actor, list_): + list_.append('value1') + list_.insert(0, 'value2') + list_.insert(2, 'value3') + list_.insert(10, 'value4') + assert sorted(list_) == sorted(['value1', 'value2', 'value3', 'value4']) + assert len(actor.list_) == 4 + + def test_set(self, list_): + list_.append('value1') + list_.append('value2') + + list_[1] = 'value3' + assert len(list_) == 2 + assert sorted(list_) == sorted(['value1', 'value3']) + + def test_insert_into_nested(self, actor, list_): + list_.append([]) + + list_[0].append('inner_item') + assert isinstance(actor.list_[0], Parameter) + assert len(list_) == 1 + assert list_[0][0] == 'inner_item' + + list_[0].append('new_item') + assert isinstance(actor.list_[0], Parameter) + assert len(list_) == 1 + assert list_[0][1] == 'new_item' + + assert list_[0] == ['inner_item', 'new_item'] + assert ['inner_item', 'new_item'] == list_[0] + + +class TestDictList(CollectionInstrumentation): + def test_dict_in_list(self, actor, list_): + list_.append({}) + assert len(list_) == 1 + assert isinstance(actor.list_[0], Parameter) + assert actor.list_[0].value == {} + + list_[0]['key'] = 'value' + assert list_[0]['key'] == 'value' + assert len(actor.list_) == 1 + assert isinstance(actor.list_[0], Parameter) + assert actor.list_[0].value['key'] == 'value' + + def test_list_in_dict(self, actor, dict_): + dict_['key'] = [] + assert len(dict_) == 1 + assert isinstance(actor.dict_['key'], Parameter) + assert actor.dict_['key'].value == [] + + dict_['key'].append('value') + assert dict_['key'][0] == 'value' + assert len(actor.dict_) == 1 + assert isinstance(actor.dict_['key'], Parameter) + assert actor.dict_['key'].value[0] == 'value' http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/78e5e2f5/tests/orchestrator/context/test_operation.py ---------------------------------------------------------------------- diff --git a/tests/orchestrator/context/test_operation.py b/tests/orchestrator/context/test_operation.py index 22dcf59..c5c9d0b 100644 --- a/tests/orchestrator/context/test_operation.py +++ b/tests/orchestrator/context/test_operation.py @@ -349,7 +349,8 @@ def test_attribute_consumption(ctx, executor, dataholder): source_node = ctx.model.node.get_by_name(mock.models.DEPENDENT_NODE_NAME) - inputs = {'dict_': {'key': 'value'}} + inputs = {'dict_': {'key': 'value'}, + 'set_test_dict': {'key2': 'value2'}} interface = mock.models.create_interface( source_node.service, node_int_name, @@ -398,12 +399,17 @@ def test_attribute_consumption(ctx, executor, dataholder): execute(workflow_func=basic_workflow, workflow_context=ctx, executor=executor) target_node = ctx.model.node.get_by_name(mock.models.DEPENDENCY_NODE_NAME) - assert len(source_node.attributes) == len(target_node.attributes) == 1 + assert len(source_node.attributes) == len(target_node.attributes) == 2 assert source_node.attributes['key'] != target_node.attributes['key'] assert source_node.attributes['key'].value == \ target_node.attributes['key'].value == \ dataholder['key'] == 'value' + assert source_node.attributes['key2'] != target_node.attributes['key2'] + assert source_node.attributes['key2'].value == \ + target_node.attributes['key2'].value == \ + dataholder['key2'] == 'value2' + def _assert_loggins(ctx, inputs): @@ -487,12 +493,18 @@ def _test_plugin_workdir(ctx, filename, content): @operation -def attribute_altering_operation(ctx, dict_, **_): +def attribute_altering_operation(ctx, dict_, set_test_dict, **_): ctx.node.attributes.update(dict_) + for key, value in set_test_dict.items(): + ctx.node.attributes[key] = value + @operation def attribute_consuming_operation(ctx, holder_path, **_): holder = helpers.FilesystemDataHolder(holder_path) ctx.target_node.attributes.update(ctx.source_node.attributes) holder.update(**ctx.target_node.attributes) + + ctx.target_node.attributes['key2'] = ctx.source_node.attributes['key2'] + holder['key2'] = ctx.target_node.attributes['key2'] \ No newline at end of file
