[Admin-Util NSX|V] availability zones support

The utility: nsxadmin -r edges -o nsx-update --property appliances=True
will now update the requested edge deployment according to its' current availability zone.
It can be used when the availability zone definition or global definition of resource pool,
data stores or edge_ha changes.

Change-Id: I8d28fec3c95c272e581d63a8fd0f2618ffb26cb8

doc/source/admin_util.rst

@@ -20,7 +20,7 @@ Edges
 
     nsxadmin -r edges -o neutron-list
 
-- Update Datastore HA of an edge: This admin utility can be used on upgrade after the customer added ha_datastore_id to the nsx.ini configuration, in order to update the deployment of existing edges. The new edge appliances configuration will be taken from the nsx.ini, including the datastrore_id, ha_datastore_id, edge_ha. The edge current resource pool & appliance size will not change::
+- Update Resource pool / Datastore / edge HA of an edge: This utility can be used on upgrade after the customer added ha_datastore_id to the nsx.ini configuration or after changing the resource pool / data store globally or per availability zone. This Utility can update the deployment of existing edges::
 
     nsxadmin -r edges -o nsx-update --property edge-id=<edge-id> --property appliances=True
 

vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py

@@ -28,8 +28,9 @@ from neutron_lib import exceptions
 from oslo_config import cfg
 
 from vmware_nsx._i18n import _LE, _LI
+from vmware_nsx.common import nsxv_constants
 from vmware_nsx.db import nsxv_db
-import vmware_nsx.plugins.nsx_v.vshield.common.constants as nsxv_constants
+from vmware_nsx.plugins.nsx_v import availability_zones as nsx_az
 import vmware_nsx.plugins.nsx_v.vshield.common.exceptions as nsxv_exceptions
 
 LOG = logging.getLogger(__name__)
@@ -164,15 +165,14 @@ def nsx_list_missing_edges(resource, event, trigger, **kwargs):
         LOG.info(formatters.tabulate_results(data))
 
 
-def change_edge_ha(properties):
-    ha = bool(properties.get('highavailability').lower() == "true")
+def change_edge_ha(ha, edge_id):
     request = {
         'featureType': 'highavailability_4.0',
         'enabled': ha}
     try:
-        nsxv.enable_ha(properties.get('edge-id'), request, async=False)
+        nsxv.enable_ha(edge_id, request, async=False)
     except nsxv_exceptions.ResourceNotFound as e:
-        LOG.error(_LE("Edge %s not found"), properties.get('edge-id'))
+        LOG.error(_LE("Edge %s not found"), edge_id)
     except exceptions.NeutronException as e:
         LOG.error(_LE("%s"), str(e))
 
@@ -192,33 +192,37 @@ def change_edge_appliance_size(properties):
         LOG.error(_LE("%s"), str(e))
 
 
-def _get_edge_resource_pool_and_size(edge_id):
+def _get_edge_az_and_size(edge_id):
     edgeapi = utils.NeutronDbClient()
     binding = nsxv_db.get_nsxv_router_binding_by_edge(
         edgeapi.context.session, edge_id)
     if binding:
-        return binding['resource_pool'], binding['appliance_size']
+        return binding['availability_zone'], binding['appliance_size']
     # default fallback
-    return cfg.CONF.nsxv.resource_pool_id, nsxv_constants.LARGE
+    return nsx_az.DEFAULT_NAME, nsxv_constants.LARGE
 
 
 def change_edge_appliance(edge_id):
     """Update the appliances data of an edge
 
-    Update the edge appliances data according to the current
-    nsx.ini config, including the edge_ha, datastore & ha_datastore.
-    The resource pool will not be modified.
+    Update the edge appliances data according to its current availability zone
+    and the nsx.ini config, including the resource pool, edge_ha, datastore &
+    ha_datastore.
+    The availability zone of the edge will not be changed.
+    This can be useful when the global resource pool/datastore/edge ha
+    configuration is updated, or when the configuration of a specific
+    availability zone was updated.
     """
-    datastore_id = cfg.CONF.nsxv.datastore_id
-    ha_datastore_id = cfg.CONF.nsxv.ha_datastore_id
     edge_ha = cfg.CONF.nsxv.edge_ha
     # find out what is the current resource pool & size, so we can keep them
-    resource_pool, size = _get_edge_resource_pool_and_size(edge_id)
-    appliances = [{'resourcePoolId': resource_pool,
-                   'datastoreId': datastore_id}]
-    if ha_datastore_id and edge_ha:
-        appliances.append({'resourcePoolId': resource_pool,
-                           'datastoreId': ha_datastore_id})
+    az_name, size = _get_edge_az_and_size(edge_id)
+    az = nsx_az.ConfiguredAvailabilityZones().get_availability_zone(az_name)
+    appliances = [{'resourcePoolId': az.resource_pool,
+                   'datastoreId': az.datastore_id}]
+
+    if az.ha_datastore_id and edge_ha:
+        appliances.append({'resourcePoolId': az.resource_pool,
+                           'datastoreId': az.ha_datastore_id})
     request = {'appliances': appliances, 'applianceSize': size}
     try:
         nsxv.change_edge_appliance(edge_id, request)
@@ -226,6 +230,9 @@ def change_edge_appliance(edge_id):
         LOG.error(_LE("Edge %s not found"), edge_id)
     except exceptions.NeutronException as e:
         LOG.error(_LE("%s"), str(e))
+    else:
+        # also update the edge_ha of the edge
+        change_edge_ha(edge_ha, edge_id)
 
 
 @admin_utils.output_header
@@ -246,7 +253,8 @@ def nsx_update_edge(resource, event, trigger, **kwargs):
     LOG.info(_LI("Updating NSXv edge: %(edge)s with properties\n%(prop)s"),
              {'edge': properties.get('edge-id'), 'prop': properties})
     if properties.get('highavailability'):
-        change_edge_ha(properties)
+        change_edge_ha(properties['highavailability'].lower() == "true",
+                       properties['edge-id'])
     elif properties.get('size'):
         change_edge_appliance_size(properties)
     elif (properties.get('appliances') and