[asterisk-commits] mjordan: testsuite/asterisk/trunk r2007 - /asterisk/trunk/lib/python/asterisk/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Mon Aug 29 11:55:29 2011
New Revision: 2007

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2007
Log:
Reverted changes for voicemail.py - included changes from TestState, which should not have been checked in as part of that review.

Modified:
    asterisk/trunk/lib/python/asterisk/voicemail.py

Modified: asterisk/trunk/lib/python/asterisk/voicemail.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/voicemail.py?view=diff&rev=2007&r1=2006&r2=2007
==============================================================================
--- asterisk/trunk/lib/python/asterisk/voicemail.py (original)
+++ asterisk/trunk/lib/python/asterisk/voicemail.py Mon Aug 29 11:55:29 2011
@@ -12,20 +12,12 @@
 import os
 import glob
 import shutil
-import logging
-
-from datetime import datetime
+
 from asterisk import Asterisk
 from config import Category
 from config import ConfigFile
-from TestCase import TestCase
-from TestState import TestState
-from TestState import TestStateController
 
 sys.path.append("lib/python")
-
-logger = logging.getLogger(__name__)
-
 
 """
 Class that manages creation of, verification of, and teardown of Asterisk mailboxes on the local filesystem
@@ -80,6 +72,7 @@
         self.__ast = ast
         self.voicemailDirectory = self.__ast.directories['astspooldir'] + '/voicemail'
 
+
     """
     Creates the basic set of folders needed for a mailbox on the file system
     context    The context that the mailbox will exist under
@@ -123,7 +116,7 @@
 
         except IOError as e:
             if e.errno == errno.EACCESS:
-                logger.error( "You do not have sufficient permissions to perform the necessary directory manipulations")
+                print "You do not have sufficient permissions to perform the necessary directory manipulations"
                 return False
 
         return True
@@ -161,15 +154,14 @@
         f.write('rdnis=unknown\n')
         f.write('priority=2\n')
         f.write('callerchan=SIP/ast1-00000000\n')
-        f.write('callerid=\"Anonymous\"<555-5555>\n')
+        f.write('callerid=\"Anonymous\"<ast1>\n')
         f.write('origdate=Tue Aug  9 10:05:13 PM UTC 2011\n')
         f.write('origtime=1312927513\n')
         if (folder == self.urgentFolderName):
             f.write('flag=Urgent\n')
         else:
             f.write('flag=\n')
-        f.write('category=tt-monkeys\n')
-        f.write('duration=6\n')
+        f.write('duration=1\n')
         f.close()
 
         for format in formats:
@@ -223,24 +215,6 @@
         """
         fileName = msgName + ".txt"
         retVal = retVal & self.checkVoiceFileExists(context, mailbox, fileName, folder)
-
-        return retVal
-
-    """
-    Check if a voicemail greeting exists on the filesystem
-    context    The context of the mailbox
-    mailbox    The mailbox
-    msgname    The name of the greeting to find
-    lstFormats The formats we expect to be recorded for us
-
-    true if the greeting exists, false otherwise
-    """
-    def checkGreetingExists(self, context, mailbox, msgname, lstFormats):
-        retVal = True
-
-        for format in lstFormats:
-            fileName = msgname + "." + format
-            retVal = retVal & self.checkVoiceFileExists(context, mailbox, fileName, "")
 
         return retVal
 
@@ -274,53 +248,6 @@
         return False
 
     """
-    An object that holds voicemail user information
-    """
-    class UserObject(object):
-        def __init__(self):
-            self.password = ""
-            self.fullname = ""
-            self.emailaddress = ""
-            self.pageraddress = ""
-
-    """
-    Gets user information from the voicemail configuration file
-
-    context    The context of the mailbox
-    mailbox    The mailbox
-    sourceFile    The file containing the user information to pull from.  Defaults
-        to voicemail.conf
-
-    returns A VoiceMailMailboxManagement.UserObject object, populated with the user's values,
-        or an empty object
-    """
-    def getUserObject(self, context, mailbox, sourceFile="voicemail.conf"):
-
-        filePath = self.__ast.baseDirectory + self.__ast.directories['astetcdir'] + "/" + sourceFile
-
-        configFile = ConfigFile(filePath)
-        userObject = VoiceMailMailboxManagement.UserObject()
-        for cat in configFile.categories:
-            if cat.name == context:
-                for kvp in cat.options:
-                    if kvp[0] == mailbox:
-                        tokens = kvp[1].split(',')
-                        i = 0
-                        for token in tokens:
-                            if i == 0:
-                                userObject.password = token
-                            elif i == 1:
-                                userObject.fullname = token
-                            elif i == 2:
-                                userObject.emailaddress = token
-                            elif i == 3:
-                                userObject.pageraddress = token
-                            i += 1
-                        return userObject
-
-        return userObject
-
-    """
     Checks if a file exists under the voicemail file structure
     context    The context of the mailbox
     mailbox    The mailbox
@@ -339,6 +266,7 @@
             return True
         else:
             return False
+
 
     def __removeItemsFromFolder__(self, mailboxPath, folder):
         folderPath = os.path.join(self.__ast.baseDirectory, "%(mp)s/%(f)s" % {'mp':mailboxPath, 'f':folder})