zun_cni_registry.py (zun-6.0.0) | : | zun_cni_registry.py (zun-7.0.0) | ||
---|---|---|---|---|
skipping to change at line 147 | skipping to change at line 147 | |||
container_uuid = self._get_container_uuid(params) | container_uuid = self._get_container_uuid(params) | |||
container_type = self._get_container_type(params) | container_type = self._get_container_type(params) | |||
if container_type == TYPE_CAPSULE: | if container_type == TYPE_CAPSULE: | |||
container = objects.Capsule.get_by_uuid(self.context, | container = objects.Capsule.get_by_uuid(self.context, | |||
container_uuid) | container_uuid) | |||
elif container_type == TYPE_CONTAINER: | elif container_type == TYPE_CONTAINER: | |||
container = objects.Container.get_by_uuid(self.context, | container = objects.Container.get_by_uuid(self.context, | |||
container_uuid) | container_uuid) | |||
else: | else: | |||
raise exception.CNIError('Unexpected type: %s', container_type) | raise exception.CNIError('Unexpected type: %s' % container_type) | |||
vifs = cni_utils.get_vifs(container) | vifs = cni_utils.get_vifs(container) | |||
for ifname, vif in vifs.items(): | for ifname, vif in vifs.items(): | |||
is_default_gateway = (ifname == consts.DEFAULT_IFNAME) | is_default_gateway = (ifname == consts.DEFAULT_IFNAME) | |||
if is_default_gateway: | if is_default_gateway: | |||
# NOTE(ygupta): if this is the default interface, we should | # NOTE(ygupta): if this is the default interface, we should | |||
# use the ifname supplied in the CNI ADD request | # use the ifname supplied in the CNI ADD request | |||
ifname = params.CNI_IFNAME | ifname = params.CNI_IFNAME | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |