Skip to content

Fix get() by modelname #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2022
Merged

Fix get() by modelname #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions diffsync/store/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ def _get_object_class_and_model(
"""Get object class and model name for a model."""
if isinstance(model, str):
modelname = model
if not hasattr(self, model):
if not hasattr(self.diffsync, model):
return None, modelname
object_class = getattr(self, model)
object_class = getattr(self.diffsync, model)
else:
object_class = model
modelname = model.get_type()
Expand All @@ -216,7 +216,7 @@ def _get_uid(
uid = object_class.create_unique_id(**identifier)
else:
raise ValueError(
f"Invalid args: ({model}, {identifier}): "
f"either {model} should be a class/instance or {identifier} should be a str"
f"Invalid args: ({model}, {object_class}, {identifier}): "
f"either {object_class} should be a class/instance or {identifier} should be a str"
)
return uid
4 changes: 4 additions & 0 deletions tests/unit/test_diffsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def test_diffsync_add_raises_already_exists_with_updated_object(generic_diffsync


def test_diffsync_get_or_instantiate_create_non_existent_object(generic_diffsync):
generic_diffsync.interface = Interface
intf_identifiers = {"device_name": "device1", "name": "eth1"}

# Assert that the object does not currently exist.
Expand All @@ -124,6 +125,7 @@ def test_diffsync_get_or_instantiate_create_non_existent_object(generic_diffsync
obj, created = generic_diffsync.get_or_instantiate(Interface, intf_identifiers)
assert created
assert obj is generic_diffsync.get(Interface, intf_identifiers)
assert obj is generic_diffsync.get("interface", intf_identifiers)


def test_diffsync_get_or_instantiate_retrieve_existing_object(generic_diffsync):
Expand All @@ -150,6 +152,7 @@ def test_diffsync_get_or_instantiate_retrieve_existing_object_w_attrs(generic_di


def test_diffsync_get_or_instantiate_retrieve_create_non_existent_w_attrs(generic_diffsync):
generic_diffsync.interface = Interface
intf_identifiers = {"device_name": "device1", "name": "eth1"}
intf_attrs = {"interface_type": "1000base-t", "description": "Testing"}

Expand All @@ -158,6 +161,7 @@ def test_diffsync_get_or_instantiate_retrieve_create_non_existent_w_attrs(generi
assert obj.interface_type == "1000base-t"
assert obj.description == "Testing"
assert obj is generic_diffsync.get(Interface, intf_identifiers)
assert obj is generic_diffsync.get("interface", intf_identifiers)


def test_diffsync_get_or_instantiate_retrieve_existing_object_wo_attrs(generic_diffsync):
Expand Down