On Fri, Feb 7, 2014 at 11:34 AM, Daan Hoogland <daan.hoogl...@gmail.com>wrote:
> Alena,
>
> The revert didn't apply. Would the folowing do the trick?
>
> if (vm.getType() == Type.User
> && network.getTrafficType() == TrafficType.Guest
> && network.getGuestType() == GuestType.Shared) {
> // remove the dhcpservice ip if this is the last nic in subnet.
> DhcpServiceProvider dhcpServiceProvider =
> getDhcpServiceProvider(network);
> if (dhcpServiceProvider != null
> &&
> isDhcpAccrossMultipleSubnetsSupported(dhcpServiceProvider)
> && isLastNicInSubnet(nic)) {
> removeDhcpServiceInSubnet(nic);
> }
> }
>
>
Daan, it would still break if network does not have DHCP service enabled,
best would be to check
'_networkModel.areServicesSupportedInNetwork(network.getId(),
Service.Dhcp)' then get the provider.
> On Fri, Feb 7, 2014 at 6:55 AM, Daan Hoogland <daan.hoogl...@gmail.com>
> wrote:
> > second thought,
> >
> > Soheils mail bounces and the commit does not refer a ticket from jira.
> > I am going to revert. I should have been more vigilant. sorry.
> >
> > On Fri, Feb 7, 2014 at 6:49 AM, Daan Hoogland <daan.hoogl...@gmail.com>
> wrote:
> >> will do Alena,
> >>
> >> thanks for the headsup
> >>
> >> On Thu, Feb 6, 2014 at 10:42 PM, Alena Prokharchyk
> >> <alena.prokharc...@citrix.com> wrote:
> >>> Soheil/Daan,
> >>>
> >>> The commit in the subject breaks network System vms destroy (VR, SSVM,
> >>> CPVM), resulting in the network removal failures. Following line
> replacement
> >>> causes the failure:
> >>>
> >>> - if (vm.getType() == Type.User &&
> >>> isDhcpAccrossMultipleSubnetsSupported(network) &&
> isLastNicInSubnet(nic) &&
> >>> network.getTrafficType() == TrafficType.Guest
> >>>
> >>> With
> >>>
> >>> + DhcpServiceProvider dhcpServiceProvider =
> >>> getDhcpServiceProvider(network);
> >>>
> >>>
> >>> When you try to call getDhcpServiceProvider(network), it throws an
> exception
> >>> because DHCP service is not enabled in Public/Control networks of
> system vms
> >>> nics. So system vm always fails to expunge.
> >>>
> >>> Could you please fix it by checking if DHCP service is enabled on the
> >>> network, before getting the DHCP service provider?
> >>>
> >>> Thanks,
> >>> Alena.
> >>>
> >>>
> >>>
> >>
> >>
> >>
> >> --
> >> Daan
> >
> >
> >
> > --
> > Daan
>
>
>
> --
> Daan
>
