Lior Vernia has uploaded a new change for review. Change subject: core: Don't store Neutron physical network on import ......................................................................
core: Don't store Neutron physical network on import This allowed Neutron physical network entries to sneak into our DB. Except for eliminating that possibility, such existing entries are cleared from the DB. Change-Id: Icb8751f06690ffb34cc72f1f2e5e14e66b4d40f1 Bug-Url: https://bugzilla.redhat.com/1127687 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java A packaging/dbscripts/upgrade/03_06_0250_remove_external_network_labels.sql 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/31680/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java index af36d76..1bee5b3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java @@ -220,7 +220,6 @@ network.setVmNetwork(true); network.setProvidedBy(new ProviderNetwork(provider.getId(), externalNetwork.getId())); network.setName(externalNetwork.getName()); - network.setLabel(externalNetwork.getProviderPhysicalNetwork()); networks.add(network); } diff --git a/packaging/dbscripts/upgrade/03_06_0250_remove_external_network_labels.sql b/packaging/dbscripts/upgrade/03_06_0250_remove_external_network_labels.sql new file mode 100644 index 0000000..bcfb7aa --- /dev/null +++ b/packaging/dbscripts/upgrade/03_06_0250_remove_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/31680 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb8751f06690ffb34cc72f1f2e5e14e66b4d40f1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
