# =============================================================================
#
# Copyright (c) 2016, Cisco Systems
# All rights reserved.
#
# # Author: Klaudiusz Staniek
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
# THE POSSIBILITY OF SUCH DAMAGE.
# =============================================================================

from csmpe.plugins import CSMPlugin


class Plugin(CSMPlugin):
    """This plugin captures custom commands and stores in the log directory."""
    name = "Custom Commands Capture Plugin"
    platforms = {'ASR9K', 'CRS', 'NCS1K', 'NCS5K', 'NCS5500', 'NCS6K', 'ASR900', 'N6K'}
    phases = {'Pre-Upgrade', 'Post-Upgrade'}

    def run(self):
        command_list = self.ctx.custom_commands
        if command_list:
            for cmd in command_list:
                self.ctx.info("Capturing output of '{}'".format(cmd))
                output = self.ctx.send(cmd, timeout=2200)
                file_name = self.ctx.save_to_file(cmd, output)
                if file_name is None:
                    self.ctx.error("Unable to save '{}' output to file: {}".format(cmd, file_name))
                    return False

        else:
            self.ctx.info("No custom commands provided.")
            return True

@@ -1550,16 +1550,65 @@
 MPlugin%0A
+from condoor.exceptions import CommandSyntaxError
 %0A%0Aclass 
@@ -2083,16 +2083,41 @@
 t(cmd))%0A
+                try:%0A    
         
@@ -2166,16 +2166,20 @@
 t=2200)%0A
+    
         
@@ -2249,16 +2249,20 @@
         
+ 
+   
 if file_
@@ -2275,16 +2275,20 @@
 s None:%0A
+    
         
@@ -2395,24 +2395,28 @@
             
+   
+ 
 return False
@@ -2415,16 +2415,133 @@
 rn False
+%0A                except CommandSyntaxError:%0A                    self.ctx.error(%22Command Syntax Error: '%22 + cmd + %22'%22)
 %0A%0A      

Add exception catching