Added new fields (thisDrive, allDrives, label, persistent, useLetter)

to files drives.py, record_types.py, sqlite_registry.py

gpoa/gpt/drives.py

@@ -68,6 +68,11 @@ def read_drives(drives_file):
         drive_obj.set_dir(props.get('letter'))
         drive_obj.set_path(props.get('path'))
         drive_obj.set_action(props.get('action'))
+        drive_obj.set_thisDrive(props.get('thisDrive'))
+        drive_obj.set_allDrives(props.get('allDrives'))
+        drive_obj.set_label(props.get('label'))
+        drive_obj.set_persistent(props.get('persistent'))
+        drive_obj.set_useLetter(props.get('useLetter'))
 
         drives.append(drive_obj)
 
@@ -95,6 +100,11 @@ class drivemap:
         self.dir = None
         self.path = None
         self.action = None
+        self.thisDrive = None
+        self.allDrives = None
+        self.label = None
+        self.persistent = None
+        self.useLetter = None
 
     def set_login(self, username):
         self.login = username
@@ -115,6 +125,21 @@ class drivemap:
     def set_action(self, action):
         self.action = action
 
+    def set_thisDrive(self, thisDrive):
+        self.thisDrive = thisDrive
+
+    def set_allDrives(self, allDrives):
+        self.allDrives = allDrives
+
+    def set_label(self, label):
+        self.label = label
+
+    def set_persistent(self, persistent):
+        self.persistent = persistent
+
+    def set_useLetter(self, useLetter):
+        self.useLetter = useLetter
+
     def to_json(self):
         drive = dict()
         drive['login'] = self.login

gpoa/storage/record_types.py

@@ -116,6 +116,12 @@ class drive_entry(object):
         self.dir = dobj.dir
         self.path = dobj.path
         self.action = dobj.action
+        self.thisDrive = dobj.thisDrive
+        self.allDrives = dobj.allDrives
+        self.label = dobj.label
+        self.persistent = dobj.persistent
+        self.useLetter = dobj.useLetter
+
 
     def update_fields(self):
         fields = dict()
@@ -125,6 +131,11 @@ class drive_entry(object):
         fields['dir'] = self.dir
         fields['path'] = self.path
         fields['action'] = self.action
+        fields['thisDrive'] = self.thisDrive
+        fields['allDrives'] = self.allDrives
+        fields['label'] = self.label
+        fields['persistent'] = self.persistent
+        fields['useLetter'] = self.useLetter
 
         return fields
 

gpoa/storage/sqlite_registry.py

@@ -121,6 +121,11 @@ class sqlite_registry(registry):
             , Column('policy_name', String)
             , Column('path', String)
             , Column('action', String)
+            , Column('thisDrive', String)
+            , Column('allDrives', String)
+            , Column('label', String)
+            , Column('persistent', String)
+            , Column('useLetter', String)
             , UniqueConstraint('sid', 'dir')
         )
         self.__folders = Table(