Improved logging, added specialcharactervalidation

python-virtualenv-requirements.txt

@@ -1,4 +1,4 @@
-Django==1.6.2
+Django
 GitPython==0.1.7
 Markdown==2.4
 PyYAML==3.10

ssddj/api/serializers.py

@@ -14,14 +14,16 @@
 
 from rest_framework import serializers
 
-from  ssdfrontend.models import Target 
-from  ssdfrontend.models import Provisioner
+from ssdfrontend.models import Target 
+from ssdfrontend.models import Provisioner
 from ssdfrontend.models import VG
+
 class ProvisionerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Provisioner
         fields = ('clientiqn','sizeinGB','serviceName')
 
+
 class TargetSerializer(serializers.ModelSerializer):
     class Meta:
         model = Target

ssddj/globalstatemanager/gsm.py

@@ -64,8 +64,7 @@ def __init__(self,serverDNS):
         try:
             self.srv = Connection(self.serverDNS,self.userName,self.keyFile)
         except:
-            logger.error("Failed SSH-exec connection on Saturn server %s" % (self.serverDNS,) )
-            logger.error(format_exc())
+            logger.critical("Failed SSH-exec connection on Saturn server %s; possible cause: %s" % (self.serverDNS,format_exc()) )
 
     def InstallScripts(self):
         """
@@ -183,7 +182,7 @@ def GetVG(self): #Unit test this again
         if vgStrList == -1:
             return -1
         vgs = self.ParseLVM(vgStrList,delimitStr,paraList)
-        logger.info("VGStating on %s returns %s " % (self.serverDNS, str(vgs)) )
+        #logger.info("VGStating on %s returns %s " % (self.serverDNS, str(vgs)) )
         rtnvguuidList = ""
         for vgname in vgs:
             try:
@@ -242,10 +241,10 @@ def GitSave(self,vguuid,commentStr):
                 repo.do_commit(commentStr)
             except:
                 var = format_exc()
-                logger.warn("%s: Git save error: %s" % (commentStr, var))
+                logger.error("During GitSave: %s: Git save error: %s" % (commentStr, var))
         except:
             var = format_exc()
-            logger.warn("%s: PYSFTP download error: %s" % (commentStr, var))
+            logger.error("During GitSave: %s: PYSFTP download error: %s" % (commentStr, var))
 
 
     def CreateTarget(self,iqnTarget,iqnInit,sizeinGB,storageip1,storageip2,vguuid):
@@ -268,7 +267,7 @@ def CreateTarget(self,iqnTarget,iqnInit,sizeinGB,storageip1,storageip2,vguuid):
             logger.info("Returning successful createtarget run")
             return 1
         else:
-            logger.info("Returning failed createtarget run")
+            logger.error("Returning failed createtarget run")
             return 0
 
     def GetTargetsState(self):
@@ -329,9 +328,11 @@ def DeleteTarget(self,iqntar,vguuid):
                 if "successfully removed" in eachLine:
                     success2=True
             if success1==True and success2==True:
-                logger.debug("successfully removed target: "+iqntar)
+                logger.info("Successful deletion of target %s from VG %s on host %s" %(iqntar,vguuid,self.serverDNS))
+
                 return 1
             else:
+                logger.error("Error deleting target %s from VG %s on host %s" %(iqntar,vguuid,self.serverDNS))
                 return -1
         return -1
 
@@ -350,6 +351,8 @@ def GetInterfaces(self):
         for addr in ipadds:
             try:
                 addr = addr.rstrip()
+                if "127.0.0.1" in addr: #Ignore loopback addresses
+                    continue
                 socket.inet_aton(addr)
                 interfaces = Interface.objects.filter(ip=addr)
                 if len(interfaces) != 1: #If 0, then new interface

ssddj/ssdfrontend/models.py

@@ -14,12 +14,20 @@
 
 from django.db import models
 from django.contrib.auth.models import User
+import string
 # Create your models here.
+from django.core.exceptions import ValidationError
+
+def validate_nospecialcharacters(value):
+    invalidcharacters = set(string.punctuation.replace("_", ""))
+    if len(invalidcharacters.intersection(value)):
+        raise ValidationError(u'%s contains a special character' % value)
+
 
 class Provisioner(models.Model):
     clientiqn = models.CharField(max_length=100)
     sizeinGB = models.FloatField()
-    serviceName = models.CharField(max_length=100)
+    serviceName = models.CharField(max_length=100,validators=[validate_nospecialcharacters])
     def __unicode__(self):              # __unicode__ on Python 2
         return self.clientiqn