From 518fbb9f0de2c7e316c9bc4ddc71d301f72463ba Mon Sep 17 00:00:00 2001
From: Christian Schirge <schirge@zalando.de>
Date: Mon, 15 Nov 2021 14:59:48 +0100
Subject: [PATCH] check in discard_config if a commit is pending

remove a pending commit before discarding the config
---
 napalm_arubaoss/ArubaOS.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/napalm_arubaoss/ArubaOS.py b/napalm_arubaoss/ArubaOS.py
index fa17dab..c7a07d4 100644
--- a/napalm_arubaoss/ArubaOS.py
+++ b/napalm_arubaoss/ArubaOS.py
@@ -155,6 +155,9 @@ def discard_config(self):
 
         :return:
         """
+        if self.has_pending_commit():
+            self.load_merge_candidate(config="no job ROLLBACK")
+
         backup_config(self=self, destination="REST_Payload_Backup")
 
     def get_arp_table(self, vrf=""):