Fix None exception in decorateResult in Cisco

Fix exception that might be caused in various Cisco commands by None value in session.getResult() return which might happen when you have fast server where LG is running on.

Fix None exception in decorateResult in Cisco
4579226e · Tomas Hlavacek · 204e81cb · 4579226e
Commit 4579226e authored Jan 24, 2013 by Tomas Hlavacek
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

ulgcisco.py src/ulgcisco.py +9 -5

No files found.
--- a/src/ulgcisco.py
+++ b/src/ulgcisco.py
@@ -380,6 +380,9 @@ class CiscoCommandBgpIPv46Sum(ulgmodel.TextCommand):
    def decorateResult(self,session,decorator_helper=None):
        if(not session):
            raise Exception('Can not decorate result without valid session.')
+
+	if(session.getResult() == None):
+            return (decorator_helper.pre(defaults.STRING_EMPTY), 1)
        
        if((not session.getRouter()) or (not decorator_helper)):
            return "<pre>\n%s\n</pre>" % session.getResult()
@@ -433,6 +436,9 @@ class CiscoCommandBgpIPv6Sum(CiscoCommandBgpIPv46Sum):
        return CiscoCommandBgpIPv46Sum.__init__(self,name,peer_address_command,peer_received_command)

    def decorateResult(self,session,decorator_helper=None):
+	if(session.getResult() == None):
+            return (decorator_helper.pre(defaults.STRING_EMPTY), 1)
+
        res=''
        for l in normalizeBGPIPv6SumSplitLines(str.splitlines(session.getResult())):
            res = res + "\n" + l
@@ -528,6 +534,9 @@ class CiscoCommandShowBgpIPv46Select(ulgmodel.TextCommand):
        if(not session):
            raise Exception("Can not decorate result without valid session passed.")

+	if(session.getResult() == None):
+            return (decorator_helper.pre(defaults.STRING_EMPTY), 1)
+
        if((not session.getRouter()) or (not decorator_helper)):
            return "<pre>\n%s\n</pre>" % session.getResult()

@@ -596,17 +605,12 @@ class CiscoCommandGraphShowBgpIPv46Uni(ulgmodel.TextCommand):
 				      name=name)

    def decorateResult(self,session,decorator_helper=None):
-        ulgmodel.debug("IN BGP GRAPH decorateResult")
        if(session.isFinished()):
-		ulgmodel.debug("IN BGP GRAPH decorateResult -> session.isFinished=TRUE")
 		if(session.getData() != None) and (session.getData() != []):
-			ulgmodel.debug("IN BGP GRAPH decorateResult -> session.getData checked OK")
 			return (decorator_helper.img(decorator_helper.getSpecialContentURL(session.getSessionId()),defaults.STRING_BGP_GRAPH),1)
 		else:
-			ulgmodel.debug("IN BGP GRAPH decorateResult -> session.getData checked failed, producing error")
 			return (decorator_helper.pre(defaults.STRING_BGP_GRAPH_ERROR), 1)
 	else:
-		ulgmodel.debug("IN BGP GRAPH decorateResult -> session.isFinished=FALSE")
 		return ('',0)

    def finishHook(self,session):