x/solar
Code Issues Proposed changes

ORM: change function property 'value' to better name 'as_set'

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-09-17 09:41:22 +02:00
parent 65316158f9
commit 3f834dd033
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solar/solar/core/resource/resource.py
View File

@ -113,7 +113,7 @@ class Resource(object):
def resource_inputs(self):
return {
i.name: i for i in self.db_obj.inputs.value
i.name: i for i in self.db_obj.inputs.as_set()
}
def to_dict(self):

2
solar/solar/core/signals.py
View File

@ -95,7 +95,7 @@ def connect_single(emitter, src, receiver, dst):
# Check for cycles
# TODO: change to get_paths after it is implemented in drivers
if emitter_input in receiver_input.receivers.value:
if emitter_input in receiver_input.receivers.as_set():
raise Exception('Prevented creating a cycle')
log.debug('Connecting {}::{} -> {}::{}'.format(

5
solar/solar/interfaces/orm.py
View File

@ -165,8 +165,7 @@ class DBRelatedField(object):
type_=self.relation_type
)
@property
def value(self):
def as_set(self):
"""
Return DB objects that are destinations for self.source_db_object.
"""
@ -184,7 +183,7 @@ class DBRelatedField(object):
def sources(self, destination_db_object):
"""
Reverse of self.value, i.e. for given destination_db_object,
Reverse of self.as_set, i.e. for given destination_db_object,
return source DB objects.
"""

21
solar/solar/test/test_orm.py
View File

@ -137,7 +137,6 @@ class TestORM(BaseResourceTest):
self.assertEqual(t1, t2)
class TestORMRelation(BaseResourceTest):
def test_children_value(self):
class TestDBRelatedObject(orm.DBObject):
@ -164,25 +163,25 @@ class TestORMRelation(BaseResourceTest):
o = TestDBObject(id='a')
o.save()
self.assertSetEqual(o.related.value, set())
self.assertSetEqual(o.related.as_set(), set())
o.related.add(r1)
self.assertSetEqual(o.related.value, {r1})
self.assertSetEqual(o.related.as_set(), {r1})
o.related.add(r2)
self.assertSetEqual(o.related.value, {r1, r2})
self.assertSetEqual(o.related.as_set(), {r1, r2})
o.related.remove(r2)
self.assertSetEqual(o.related.value, {r1})
self.assertSetEqual(o.related.as_set(), {r1})
o.related.add(r2)
self.assertSetEqual(o.related.value, {r1, r2})
self.assertSetEqual(o.related.as_set(), {r1, r2})
o.related.remove(r1, r2)
self.assertSetEqual(o.related.value, set())
self.assertSetEqual(o.related.as_set(), set())
o.related.add(r1, r2)
self.assertSetEqual(o.related.value, {r1, r2})
self.assertSetEqual(o.related.as_set(), {r1, r2})
with self.assertRaisesRegexp(errors.SolarError, '.*incompatible type.*'):
o.related.add(o)
@ -208,8 +207,8 @@ class TestORMRelation(BaseResourceTest):
o1.related.add(o2)
o2.related.add(o3)
self.assertEqual(o1.related.value, {o2})
self.assertEqual(o2.related.value, {o3})
self.assertEqual(o1.related.as_set(), {o2})
self.assertEqual(o2.related.as_set(), {o3})
class TestResourceORM(BaseResourceTest):
@ -227,4 +226,4 @@ class TestResourceORM(BaseResourceTest):
r.add_input('ip', 'str!', '10.0.0.2')
self.assertEqual(len(r.inputs.value), 1)
self.assertEqual(len(r.inputs.as_set()), 1)