x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V Fix router resize for older NSX versions"

Browse Source
This commit is contained in:
Jenkins 2016-12-22 11:15:36 +00:00 committed by Gerrit Code Review
commit 6aa60efefb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py
View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from distutils import version
import time import time
from neutron.plugins.common import constants as plugin_const from neutron.plugins.common import constants as plugin_const
@ -510,6 +511,11 @@ class EdgeApplianceDriver(object):
LOG.debug('Edge %s is already with size %s', LOG.debug('Edge %s is already with size %s',
edge_id, size) edge_id, size)
return return
ver = self.vcns.get_version()
if version.LooseVersion(ver) < version.LooseVersion('6.2.3'):
# remove some data that will make the update fail
edge_utils.remove_irrelevant_keys_from_edge_request(edge)
# set the new size in the request # set the new size in the request
edge['appliances']['applianceSize'] = size edge['appliances']['applianceSize'] = size
# update the edge # update the edge