Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: Avoid storing external network label in oVirt-engine DB ......................................................................
engine: Avoid storing external network label in oVirt-engine DB Network labels for oVirt-engine and for Neutron should not be mixed when creating a network and labelling it. For oVirt-engine network only oVirt-engine labels should be presented for newly created network and for Neutron network only Neutron labels. External network label should not be stored in oVirt-engine DB. As soon as we won't store the external network labels it would never be mixed up with the oVirt-engine managed network labels. Change-Id: Ic3c041d6900a8af852f1d186c626be315d205be6 Bug-Url: https://bugzilla.redhat.com/1077132 Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/AddNetworkOnProviderCommand.java A packaging/dbscripts/upgrade/03_05_0150_nullify_external_network_labels.sql 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/26033/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/AddNetworkOnProviderCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/AddNetworkOnProviderCommand.java index 140f022..5479d1e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/AddNetworkOnProviderCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/AddNetworkOnProviderCommand.java @@ -41,6 +41,7 @@ NetworkProviderProxy proxy = ProviderProxyFactory.getInstance().create(getProvider()); getNetwork().getProvidedBy().setExternalId(proxy.add(getNetwork())); getNetwork().setVlanId(null); + getNetwork().setLabel(null); TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { diff --git a/packaging/dbscripts/upgrade/03_05_0150_nullify_external_network_labels.sql b/packaging/dbscripts/upgrade/03_05_0150_nullify_external_network_labels.sql new file mode 100644 index 0000000..57e9d11 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_0150_nullify_external_network_labels.sql @@ -0,0 +1,3 @@ +UPDATE network +SET label=NULL +WHERE provider_network_external_id IS NOT NULL; -- To view, visit http://gerrit.ovirt.org/26033 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3c041d6900a8af852f1d186c626be315d205be6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
