Commit 91dbbca8 authored by Romain Courteaud's avatar Romain Courteaud

slapos_upgrader: it seems activity is also triggered on already migrated instance

parent f5ef50e8
...@@ -12,9 +12,13 @@ connection_xml = instance.getConnectionXml() ...@@ -12,9 +12,13 @@ connection_xml = instance.getConnectionXml()
remote_node = portal.restrictedTraverse(remote_node_relative_url) remote_node = portal.restrictedTraverse(remote_node_relative_url)
remote_partition = instance.getAggregateValue() remote_partition = instance.getAggregateValue()
assert instance_virtual_master_relative_url == remote_node.getFollowUp() try:
assert instance_virtual_master_relative_url != remote_node.getDestinationProject() assert instance_virtual_master_relative_url == remote_node.getFollowUp()
assert remote_partition.getFollowUp() == remote_node.getDestinationProject() assert instance_virtual_master_relative_url != remote_node.getDestinationProject()
assert remote_partition.getFollowUp() == remote_node.getDestinationProject()
except AssertionError:
# Something wrong here, maybe the instance was already migrated
return
######################################################### #########################################################
# Move current instance to the remote node # Move current instance to the remote node
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment