apache · srikanteswartalluri · Apr 13, 2015 · DaanHoogland · Jul 10, 2015
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
@@ -790,8 +790,13 @@ def createZones(self, zones):
                    self.createPrimaryStorages(zone.primaryStorages,
                                               zoneId,
                                               )
-                enabled = getattr(zone, 'enabled', 'True')
-                if enabled == 'True' or enabled is None:
+
+                #get the variable from config file whether to enable zone or not
+                #If "enabled" tag is not found in config file, enable the zone otherwise
+                #act as mentioned in the config file
+                enabled = str(getattr(zone, 'enabled', None))
+                enabled = enabled if enabled else 'true'
+                if enabled.lower() == 'true':
                    self.enableZone(zoneId, "Enabled")
                details = getattr(zone, 'details')
                if details is not None:
-Original file line number
+Diff line change
@@ -790,8 +790,13 @@ def createZones(self, zones):
                         self.createPrimaryStorages(zone.primaryStorages,
                                                    zoneId,
                                                    )
-                    enabled = getattr(zone, 'enabled', 'True')
-                    if enabled == 'True' or enabled is None:
+                    #get the variable from config file whether to enable zone or not
+                    #If "enabled" tag is not found in config file, enable the zone otherwise
+                    #act as mentioned in the config file
+                    enabled = str(getattr(zone, 'enabled', None))
+                    enabled = enabled if enabled else 'true'
+                    if enabled.lower() == 'true':
               Copy link

  
        
      
    

    
        

  
    Contributor


        

    
  

  
    
      
          
      

      
            DaanHoogland
  

      

      

      


        Jul 10, 2015


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      should work but why not make a str('boolean') a real bool?

if enabled.lower == true:

enable = True

else:

enable = False

if enable:
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
                         self.enableZone(zoneId, "Enabled")
                     details = getattr(zone, 'details')
                     if details is not None:
-          Expand Down