Author: gnichols
Date: 2012-03-09 12:30:38 +0000 (Fri, 09 Mar 2012)
New Revision: 1219
Modified:
trunk/v7/environment.py
Log:
782191 - FEAT: v7 should be able to open a new certification request\n 799921 - v7 1.5 R7
may trace-back on older /etc/v7.xml environment file.
Modified: trunk/v7/environment.py
===================================================================
--- trunk/v7/environment.py 2012-03-09 12:28:59 UTC (rev 1218)
+++ trunk/v7/environment.py 2012-03-09 12:30:38 UTC (rev 1219)
@@ -48,6 +48,7 @@
self.defaultResultsWarningSize = 12 * 1048576 # bytes
self.defaultFVGuestTimelimit = 60 # minutes
self.defaultRebootTimelimit = 10 # minutes
+
self.defaultCatalogURL="http://hwcert-web2-test.devel.redhat.com/xml...
try:
self.load(self.environmentFile)
@@ -100,6 +101,8 @@
self.setTextNode(element, self.defaultGuestBootDirectory)
element = self.findOrCreateElement(urlElement, Tags.partner_server)
self.setTextNode(element, self.defaultPartnerServerURL)
+ element = self.findOrCreateElement(urlElement, Tags.catalog_url)
+ self.setTextNode(element, self.defaultCatalogURL)
timeLimitsElement = self.findOrCreateElement(self.document.documentElement,
Tags.time_limits)
timeLimitsElement.setAttribute(Attributes.fv_guest_timelimit, "%u" %
self.defaultFVGuestTimelimit)
@@ -185,6 +188,8 @@
def getCertificationFileName(self):
dataDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(),
Tags.data_directory)
+ if not dataDirectoryElement.getAttribute(Attributes.certification_name):
+ return self.defaultCertificationName
return dataDirectoryElement.getAttribute(Attributes.certification_name)
def getLockFile(self):
@@ -236,6 +241,12 @@
def getPartnerServerURL(self):
element = self.findOrCreateElement(self._getURLsElement(), Tags.partner_server)
return self.getTextNode(element).data
+
+ def getCatalogURL(self):
+ element = self.findOrCreateElement(self._getURLsElement(), Tags.catalog_url)
+ if not self.getTextNode(element) or not self.getTextNode(element).data:
+ return self.defaultCatalogURL
+ return self.getTextNode(element).data
def getMaximumAttachmentSize(self):
return
string.atoi(self._getFilesystemElement().getAttribute(Attributes.maximum_attachment_size))