Ticket #1035: sfa-2.0-9-patch-10.diff

/usr/lib/python2.6/site-packages/sfa/managers/

@@ -198 +198 @@
             elif vlan[1] == 'FAILED' or vlan[1] == 'UNKNOWN':
                 res['geni_status'] = 'failed'
                 res['geni_error'] = vlan[2]
+            elif vlan[1] == 'CANCELLED':
+                res['geni_status'] = 'failed'
+                res['geni_error'] = 'VLAN cancelled by rollback from contingent failure'
             else:
                 res['geni_status'] = 'changing'
             resources.append(res)
@@ -252 +255 @@
             raise ExistingRecord(slice_id)
         elif output.find("Rspec parsing failed") > 0 or output.find("Rspec needs to have rspecName") > 0:
             raise InvalidRSpec(slice_id)
+        elif output.find("AxisFault") > 0:
+            raise SfaAPIError("Unknown AM internal error")
         elif output.find("Status => FAILED") > 0:
             errmsg = re.search("Message => ([^\n]+)", output)
             if errmsg == None:
-                raise SfaAPIError('Unknown AM internal failure')
+                raise SfaAPIError('Unknown internal failure')
             if errmsg.group(1) != None:
                 raise SfaAPIError(errmsg.group(1))
         elif output.find("Exception") > 0: