AvalonInstance expect host and creator as arguments

This commit is contained in:
iLLiCiTiT 2021-07-13 10:39:08 +02:00
parent 28a834e47a
commit 7c2bb13e68
2 changed files with 13 additions and 4 deletions

View file

@ -26,7 +26,12 @@ class AvalonInstance:
data(dict): Data used for filling subset name or override data from
already existing instance.
"""
def __init__(self, family, subset_name, data=None, new=True):
def __init__(
self, host, creator, family, subset_name, data=None, new=True
):
self.host = host
self.creator = creator
# Family of instance
self.family = family
# Subset name
@ -66,14 +71,16 @@ class AvalonInstance:
self.data = data
@classmethod
def from_existing(cls, instance_data):
def from_existing(cls, host, creator, instance_data):
"""Convert instance data from workfile to AvalonInstance."""
instance_data = copy.deepcopy(instance_data)
family = instance_data.pop("family", None)
subset_name = instance_data.pop("subset", None)
return cls(
host, creator, family, subset_name, instance_data, new=False
)
return cls(family, subset_name, instance_data, new=False)
@six.add_metaclass(ABCMeta)

View file

@ -102,7 +102,9 @@ class PublisherController:
instance_data = creator.convert_family_attribute_values(
instance_data
)
instance = AvalonInstance.from_existing(instance_data)
instance = AvalonInstance.from_existing(
self.host, creator, instance_data
)
instances.append(instance)
self.instances = instances