If 'Virtual Network' already has value than no need to resolve it.

vlan auto service returns the VLAN ID
get_vlan_services was changed to check by existence of Virtual Network attribute

Author: borismod

deployed_app_service/__main__.py

@@ -15,7 +15,7 @@ def main():
 
     vlan_id = helpers.get_user_param('VLAN_ID')
     if not vlan_id:
-        raise ValueError('VLAN_ID is missoing')
+        raise ValueError('VLAN_ID is missing')
 
     deployed_app_service.connect(vlan_spec_type, vlan_id)
 

environment_scripts/connect_all.py

@@ -5,7 +5,11 @@
 from common.utilites.command_result import get_result_from_command_output
 
 from common.logger.service import getLogger
-_logger  = getLogger('EnvironmentConnector')
+_logger = getLogger('EnvironmentConnector')
+
+VIRTUAL_NETWORK_ATTRIBUTE = 'Virtual Network'
+ACCESS_MODE_ATTRIBUTE = 'Access Mode'
+
 
 class EnvironmentConnector(object):
     def connect_all(self):
@@ -27,19 +31,30 @@ def connect_all(self):
 
         for vlan_service in vlan_services:
 
-            if not len(vlan_service.Attributes):
-                raise ValueError('No attributes on service {0}'.format(vlan_service.ServiceName))
+            _logger.debug('Connecting \'{0}\' '.format(vlan_service.ServiceName))
 
-            access_mode = self._get_attribute(vlan_service.Attributes, 'Access Mode')
-            virtual_network = self._get_attribute(vlan_service.Attributes, 'Virtual Network')
+            access_mode = self._get_attribute(vlan_service.Attributes, ACCESS_MODE_ATTRIBUTE)
+            virtual_network = self._get_attribute(vlan_service.Attributes, VIRTUAL_NETWORK_ATTRIBUTE)
 
             # Get Deployed App connected to VLAN Auto service
             connected_resources = self._get_connected_resources(connectors, vlan_service)
 
             if not connected_resources:
                 continue
 
-            session.ExecuteCommand(reservation_id, vlan_service.ServiceName, 'Service', 'Auto Resolve Vlan', [], True)
+            if not virtual_network or virtual_network == '':
+
+                _logger.debug('Executing Auto Resolve Vlan on \'{0}\''.format(vlan_service.ServiceName))
+
+                command_result = session.ExecuteCommand(reservation_id, vlan_service.ServiceName, 'Service',
+                                                        'Auto Resolve Vlan', [], True)
+
+                virtual_network = get_result_from_command_output(command_result.Output)
+
+                _logger.debug('Auto Resolve Vlan returned Virtual Network \'{0}\''.format(virtual_network))
+
+                if not virtual_network or virtual_network == '':
+                    raise ValueError('Auto Resolve Vlan command did not return Virtual Network')
 
             for connected_resource in connected_resources:
                 self._execute_connect_command_on_connected_resource(access_mode, connected_resource, reservation_id,
@@ -48,7 +63,7 @@ def connect_all(self):
     @staticmethod
     def _get_attribute(attributes, attribute_name):
         attribute = next(item for item in attributes if item.Name == attribute_name)
-        if not attribute or not attribute.Value:
+        if not attribute:
             raise ValueError('Attribute {0} is missing'.format(attribute_name))
         return attribute.Value
 
@@ -60,7 +75,7 @@ def _get_connectors(reservation_details):
     @staticmethod
     def _get_vlan_auto_services(reservation_details):
         vlan_services = [service for service in reservation_details.ReservationDescription.Services
-                         if service.ServiceName == 'VLAN Auto']
+                         if VIRTUAL_NETWORK_ATTRIBUTE in [attr.Name for attr in service.Attributes]]
         return vlan_services
 
     @staticmethod

vCenterShell/commands/connect_dvswitch.py

@@ -62,10 +62,5 @@ def _prepare_mappings(self, vm_network_mappings):
             vm_network_mapping.vlan_spec = \
                 self.vlan_spec_factory.get_vlan_spec(vm_network_mapping.vlan_spec)
 
-            self.logger.debug('Vlan Id: {0}, VLAN Spec: {1}, Port Name {2}',
-                              vm_network_mapping.vlan_id,
-                              vm_network_mapping.vlan_spec,
-                              vm_network_mapping.dv_port_name)
-
             mappings.append(vm_network_mapping)
         return mappings

vCenterShellPackage/App Templates/VM Deployment.xml

@@ -16,7 +16,7 @@
             <Attribute Name="VM Cluster" Value="QualiSB Cluster/LiverPool" />
             <Attribute Name="VM Power State" Value="False" />
             <Attribute Name="VM Storage" Value="eric ds cluster" />
-            <Attribute Name="vCenter Template" Value="vCenter/QualiSB/Alex/test" />
+            <Attribute Name="vCenter Template" Value="vCenter/QualiSB/YOUR_FOLDER/YOUR_TEMPLATE" />
           </Attributes>
         </DeploymentService>
       </DeploymentPath>

vlan_service/auto/__main__.py

@@ -1,12 +1,11 @@
 import os
 import models
 from time import sleep
-
 import qualipy.scripts.cloudshell_scripts_helpers as helpers
 from qualipy.api.cloudshell_api import AttributeNameValue
-
 from common.model_factory import ResourceModelParser
 from vlan_service.resolver.provider import VlanResolverProvider
+from common.utilites.command_result import set_command_result
 
 
 def main():
@@ -40,10 +39,12 @@ def main():
                                                                                            str(vlan_id)))
     else:
         # write already resolved message to reservation output
+        vlan_id = str(vlan_auto_resource_model.virtual_network)
         api.WriteMessageToReservationOutput(reservation_context.id,
                                             "{0} already has a resolved vlan id: {1}"
                                             .format(resource_context.name,
-                                                    str(vlan_auto_resource_model.virtual_network)))
+                                                    vlan_id))
+    set_command_result(vlan_id)
 
 
 if __name__ == "__main__":