Code cleanup done for Globals.py

Signed-off-by: Tim <timothyasir@gluster.com>

1 files changed, 7 insertions, 70 deletions

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py
index ea37fa92..26a74bfd 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py
@@ -11,71 +11,33 @@ SERVER_PORT = 24731
 DEFAULT_BACKLOG = 5
 DEFAULT_TIMEOUT = 3
 DEFAULT_ID_LENGTH = 16
-
 GLUSTER_PLATFORM_VERSION = "3.2"
 
 ## System configuration constants
 SYSCONFIG_NETWORK_DIR  = "/etc/sysconfig/network-scripts"
-DNSMASQ_CONF_DIR       = "/etc/dnsmasq.d"
-
 FSTAB_FILE             = "/etc/fstab"
-NFS_EXPORTS_FILE       = "/etc/exports"
 SAMBA_CONF_FILE        = "/etc/samba/smb.conf"
-TIMEZONE_FILE          = "/etc/timezone"
-ZONEINFO_DIR           = "/usr/share/zoneinfo"
-LOCALTIME_FILE         = "/etc/localtime"
-KERBEROS_CONF_FILE     = "/etc/krb5.conf"
-NSSWITCH_CONF_FILE     = "/etc/nsswitch.conf"
-NTP_CONF_FILE          = "/etc/ntp.conf"
+REAL_SAMBA_CONF_FILE   = "/etc/samba/real.smb.conf"
 MODPROBE_CONF_FILE     = "/etc/modprobe.d/bonding.conf"
-SYSCONFIG_NETWORK_FILE = "/etc/sysconfig/network"
 RESOLV_CONF_FILE       = "/etc/resolv.conf"
 DNSMASQ_LEASE_FILE     = "/var/tmp/dnsmasq.leases"
 LIVE_MODE_FILE         = "/etc/live"
-ADD_SERVER_COMPLETED_FILE   = "/var/tmp/installation-completed"
-
-DNSMASQ_DNS_CONF_FILE  = DNSMASQ_CONF_DIR + "/dns.conf"
+DNSMASQ_CONF_DIR       = "/etc/dnsmasq.d"
 DNSMASQ_DHCP_CONF_FILE = DNSMASQ_CONF_DIR + "/dhcp.conf"
-##
-
-## Base constants
-MAX_PARTITION_SIZE = 16777216 # 16 TB
-OS_PARTITION_SIZE  = 4000     # 4 GB
-SESSION_TIMEOUT    = 1800     # 30 minutes
-SERVER_AGENT_PORT  = 50000
-
-BOOT_PARTITION_LABEL      = "GLUSTEROS"
 DATA_PARTITION_LABEL      = "GLUSTERDATA"
 VOLUME_USER_DESCRIPTION   = "Gluster Volume User"
-SERVER_AGENT_RUN_USERNAME = "gluster"
+GLUSTER_BASE_DIR          = "/etc/glustermg"
+REEXPORT_DIR              = "/reexport"
+CIFS_EXPORT_DIR           = "/cifs"
+GLUSTER_UPDATES_FILE      = "updates.xml"
 INSTALLER_SERVER_NAME     = "$installer$"
 
-GLUSTER_BASE_DIR         = "/etc/glustermg"
-GLUSTER_LUN_DIR          = "/data"
-REEXPORT_DIR             = "/reexport"
-NFS_EXPORT_DIR           = "/nfs"
-CIFS_EXPORT_DIR          = "/cifs"
-WEBDAV_DOCUMENT_ROOT_DIR = "/var/www/html"
-UPDATES_DIR              = "/UPDATES"
-TRANSPORT_HOME_DIR       = "/transport"
-GLUSTERFS_LOG_DIR        = "/var/log/glusterfs"
-LOG_DIR                  = "/var/log/glustermg"
-
-GLUSTER_UPDATES_FILE        = "updates.xml"
-INSTALLER_STATUS_FILE       = "/var/log/install-server-status.log"
-INSTALL_PLATFORM_LOCK_FILE  = "/var/lock/install-gluster-platform.lock"
-LAST_ACCESSED_NETWORK_FILE  = "last-accessed-network"
-PREPARE_DATA_DISK_LOCK_FILE = "/var/tmp/prepare-data-disk.lock"
-##
-
 ## Derived constants
 GLUSTER_CONF_DIR   = GLUSTER_BASE_DIR + "/conf"
 GLUSTER_TMP_DIR    = GLUSTER_BASE_DIR + "/tmp"
 VOLUME_CONF_DIR    = GLUSTER_BASE_DIR + "/volumes"
 SERVER_CONF_DIR    = GLUSTER_BASE_DIR + "/servers"
 DNS_RECORDS_DIR    = GLUSTER_BASE_DIR + "/dns-records"
-INSTALLER_CONF_DIR = SERVER_CONF_DIR + "/" + INSTALLER_SERVER_NAME
-
 GSN_USER_INFO_FILE                  = GLUSTER_BASE_DIR + "/gsn-user.info"
 GLUSTER_VERSION_FILE                = GLUSTER_BASE_DIR + "/version"
 GLUSTER_UPDATE_SITE_FILE            = GLUSTER_BASE_DIR + "/update-site"
@@ -86,37 +48,12 @@ SERVER_COUNT_FILE                   = GLUSTER_BASE_DIR + "/server-count"
 SIGNATURE_FILE                      = GLUSTER_BASE_DIR + "/.signature"
 GLUSTER_SERVER_POOL_FILE            = GLUSTER_BASE_DIR + "/pool"
 GLUSTER_ADMIN_FILE                  = GLUSTER_BASE_DIR + "/.password"
-
+INSTALLER_CONF_DIR  = SERVER_CONF_DIR + "/" + INSTALLER_SERVER_NAME
 VOLUME_SMBCONF_FILE = VOLUME_CONF_DIR + "/volumes.smbconf.list"
-
 GLOBAL_NETWORK_FILE         = INSTALLER_CONF_DIR + "/network.xml"
-INSTALL_SERVER_CONF_FILE    = INSTALLER_CONF_DIR + "/installer.xml"
-INSTALLER_INFO_FILE         = INSTALLER_CONF_DIR + "/installer.info"
 INSTALLED_SERVER_COUNT_FILE = INSTALLER_CONF_DIR + "/installed-server-count"
 
-SESSION_FILE = GLUSTER_TMP_DIR + "/login.sessions"
-
-GENERAL_LOG_FILE         = LOG_DIR + "/general.log"
-INSTALLER_LOG_FILE       = LOG_DIR + "/installer.log"
-PEER_AGENT_LOG_FILE    = LOG_DIR + "/peeragent.log"
-SERVER_AGENT_LOG_FILE    = LOG_DIR + "/serveragent.log"
-TRANSPORT_AGENT_LOG_FILE = LOG_DIR + "/transport.log"
-##
-
-
-## Global variables
-## TODO: These should be removed
-DOWNLOAD_GLUSTER_UPDATE_PROCESS = None
-DOWNLOAD_GLUSTER_UPDATE_LEVEL = None
-DOWNLOAD_GLUSTER_CURRENT_UPDATE_LEVEL = None
-DOWNLOAD_GLUSTER_UPDATE_MD5SUM = None
-REQUEST_MAP = {}
-VERSION_DICTONARY = {}
-##
-
 AWS_WEB_SERVICE_URL = "http://169.254.169.254/latest"
-REAL_SAMBA_CONF_FILE = "/etc/samba/real.smb.conf"
-
 DEFAULT_UID = 1024000
 CIFS_USER_FILE = "/opt/glustermg/etc/users.cifs"
 CIFS_VOLUME_FILE  = "/opt/glustermg/etc/volumes.cifs"