Merge pull request #124 from QualiSystems/feature/alex_46_vlan_auto_service

Updated vlan auto to work correctly according to design

Author: alexazarh

common/logger/__init__.py

@@ -69,7 +69,7 @@ def get_logging_config(level_console="DEBUG", level_file=None, logfile=None):
                 }
     return logger
 
-print os.environ.get("LOG_LEVEL") or "DEBUG"
+# print os.environ.get("LOG_LEVEL") or "DEBUG"
 initial_log_level = os.environ.get("LOG_LEVEL") or "DEBUG"
 logging.config.dictConfig(get_logging_config(initial_log_level))
 

tests/test_vlan_service/test_vlan_resolver.py

@@ -146,7 +146,7 @@ def test_vlan_service_requested_specific_vlan_numeric_outside_of_allocated_range
 
         self.assertRaises(ValueError, resolver._ensure_numeric_vlan_valid, allocation_range)
 
-    def test_vlan_service_get_requested_vlan_returns_range(self):
+    def test_vlan_service_get_requested_vlan_range_throws_not_supported(self):
         vlan_resource_model = VLANAutoResourceModel()
         vlan_resource_model.vlan_id = "20-30"
         vlan_resource_model.virtual_network = ""
@@ -158,10 +158,7 @@ def test_vlan_service_get_requested_vlan_returns_range(self):
                                         owner_id="VLAN Auto",
                                         api=Mock())
 
-        requested_range = resolver._get_requested_vlan()
-
-        self.assertEquals(requested_range.start, 20)
-        self.assertEquals(requested_range.end, 30)
+        self.assertRaises(ValueError, resolver._get_requested_vlan_auto)
 
     def test_vlan_service_get_requested_vlan_returns_numeric(self):
         vlan_resource_model = VLANAutoResourceModel()
@@ -175,7 +172,7 @@ def test_vlan_service_get_requested_vlan_returns_numeric(self):
                                         owner_id="VLAN Auto",
                                         api=Mock())
 
-        vlan = resolver._get_requested_vlan()
+        vlan = resolver._get_requested_vlan_auto()
 
         self.assertEquals(vlan, 20)
 
@@ -204,15 +201,15 @@ def test_vlan_service_resolves_specific_numeric(self):
                                                       "VLAN Auto", "Exclusive", 20)
         self.assertEquals(resolved_vlan, 20)
 
-    def test_vlan_service_resolves_first_numeric_from_range(self):
+    def test_vlan_service_resolves_first_numeric_when_vlan_id_empty(self):
         vlan_resource_model = VLANAutoResourceModel()
-        vlan_resource_model.vlan_id = "20-30"
+        vlan_resource_model.vlan_id = ""
         vlan_resource_model.isolation_level = "Exclusive"
         vlan_resource_model.virtual_network = ""
         vlan_resource_model.allocation_ranges = "10-100"
 
         resolved_vlan_info = Mock()
-        resolved_vlan_info.VlanId = 20
+        resolved_vlan_info.VlanId = 10
 
         api = MagicMock()
         api.GetVlanAutoSelectFirstNumericFromRange = Mock(return_value=resolved_vlan_info)
@@ -226,5 +223,5 @@ def test_vlan_service_resolves_first_numeric_from_range(self):
         resolved_vlan = resolver.resolve_vlan_auto()
 
         api.GetVlanAutoSelectFirstNumericFromRange.assert_called_with("Global", "c5144273-c456-4885-a9b7-f5b058f02678",
-                                                                      "VLAN Auto", "Exclusive", 20, 30)
-        self.assertEquals(resolved_vlan, 20)
+                                                                      "VLAN Auto", "Exclusive", 10, 100)
+        self.assertEquals(resolved_vlan, 10)

vlan_service/auto/__main__.py

@@ -1,11 +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
+from common.logger import getLogger
+
+_logger = getLogger('VlanAuto')
 
 
 def main():
@@ -27,23 +27,20 @@ def main():
     if not vlan_service_provider.is_vlan_resolved():
         # resolve vlan id
         vlan_id = vlan_service_provider.resolve_vlan_auto()
+        vlan_id = str(vlan_id)
         # set resolved vlan id to virtual network attribute
         api.SetServiceAttributesValues(reservation_context.id,
                                        resource_context.name,
                                        [AttributeNameValue(
                                                vlan_auto_resource_model.virtual_network_attribute,
                                                vlan_id)])
-        # write success message to reservation output
-        api.WriteMessageToReservationOutput(reservation_context.id,
-                                            "{0} resolved vlan id {1} successfully".format(resource_context.name,
-                                                                                           str(vlan_id)))
+        _logger.info("{0} resolved vlan id {1} successfully".format(resource_context.name, 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,
-                                                    vlan_id))
+        _logger.info("{0} already has a resolved vlan id: {1}".format(resource_context.name, vlan_id))
+
+    # command result for programmatic use
     set_command_result(vlan_id)
 
 

vlan_service/resolver/provider.py

@@ -25,7 +25,7 @@ def resolve_vlan_auto(self):
         if self.is_vlan_resolved():
             return self.vlan_resource_model.virtual_network
 
-        requested_vlan = self._get_requested_vlan()
+        requested_vlan = self._get_requested_vlan_auto()
 
         if isinstance(requested_vlan, self.VlanRange):
             vlan_range = requested_vlan
@@ -51,19 +51,25 @@ def is_vlan_resolved(self):
             return False
         return True
 
-    def _get_requested_vlan(self):
+    def _get_requested_vlan_auto(self):
         """
         returns the requested vlan (specific numeric OR numeric range)
         :return: numeric vlan id OR numeric vlan range
         """
-        self._ensure_vlan_id_not_empty()
 
         allocation_range = self._get_allocation_range()
 
+        if not self.vlan_resource_model.vlan_id:
+            # Vlan Id empty, get first available from allocation range
+            return allocation_range
+
+        # self._ensure_vlan_id_not_empty()
+
         if self._is_vlan_id_range():
-            vlan_range = self._get_vlan_range_from_vlan_id()
-            self._ensure_vlan_range_valid(vlan_range, allocation_range)
-            return vlan_range
+            raise ValueError("Vlan range is not supported")
+            # vlan_range = self._get_vlan_range_from_vlan_id()
+            # self._ensure_vlan_range_valid(vlan_range, allocation_range)
+            # return vlan_range
         else:
             self._ensure_numeric_vlan_valid(allocation_range)
             return int(self.vlan_resource_model.vlan_id)