Mike Kolesnik has posted comments on this change.
Change subject: engine: Remove vNIC from external network when necessary
......................................................................
Patch Set 2:
(5 comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
Line 90: true,
Line 91: false);
Line 92:
Line 93: for (VmNic nic : getInterfaces()) {
Line 94: ExternalNetworkManager externalNetworkManager = new
ExternalNetworkManager(nic);
Done
Line 95: externalNetworkManager.deallocateIfExternal();
Line 96: }
Line 97:
Line 98: TransactionSupport.executeInNewTransaction(new
TransactionMethod<Void>() {
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java
Line 116: protected void removeFromExternalNetworks(List<VmNic> interfaces)
{
Line 117: Transaction transaction = TransactionSupport.suspend();
Line 118: for (VmNic iface : interfaces) {
Line 119: new ExternalNetworkManager(iface).deallocateIfExternal();
Line 120: }
Done
Line 121: TransactionSupport.resume(transaction);
Line 122: }
Line 123:
Line 124: /**
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
Line 79: if (isVnicProfileChanged(oldIface, getInterface())) {
Line 80: Network newNetwork =
NetworkHelper.getNetworkByVnicProfileId(getInterface().getVnicProfileId());
Line 81: Network oldNetwork =
NetworkHelper.getNetworkByVnicProfileId(oldIface.getVnicProfileId());
Line 82: if (ObjectUtils.notEqual(oldNetwork, newNetwork)) {
Line 83: ExternalNetworkManager externalNetworkManager =
new ExternalNetworkManager(oldIface);
Done
Line 84: externalNetworkManager.deallocateIfExternal();
Line 85: }
Line 86: }
Line 87:
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java
Line 197: for (Port port : ports) {
Line 198: if (DEVICE_OWNER.equals(port.getDeviceOwner()) &&
nic.getId().toString().equals(port.getDeviceId())) {
Line 199: return port;
Line 200: }
Line 201: }
Done
Line 202: return null;
Line 203: }
Line 204:
Line 205: @JsonIgnoreProperties(ignoreUnknown = true)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
Line 95: final List<Network> networks =
getNetworkDAO().getAllForDataCenter(getStoragePoolId());
Line 96: for (Network network : networks) {
Line 97: if (network.isExternal()) {
Line 98: for (VmNic nic :
getVmNicDao().getAllForNetwork(network.getId())) {
Line 99: ExternalNetworkManager externalNetworkManager =
new ExternalNetworkManager(nic, network);
Done
Line 100: externalNetworkManager.deallocateIfExternal();
Line 101: }
Line 102: }
Line 103: }
--
To view, visit http://gerrit.ovirt.org/19966
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I027992f52c35add0afd1ffe207b1adbdb2c5c957
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
Gerrit-Reviewer: Lior Vernia <lver...@redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkole...@redhat.com>
Gerrit-Reviewer: Moti Asayag <masa...@redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
