Merge pull request #52 from fooelisa/revert-46-master

Revert "Fixed the syntax error from my pull request earlier"
fooelisa · Jul 25, 2017 · d8e7f09 · d8e7f09
2 parents 52a6f52 + 7e0cc92
commit d8e7f09
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 44 deletions.
diff --git a/pyIOSXR/iosxr.py b/pyIOSXR/iosxr.py
@@ -582,17 +582,17 @@ def commit_config(self, label=None, comment=None, confirmed=None):
         :param comment:   Commit label, displayed instead of the commit ID on the device.
         :param confirmed: Commit with auto-rollback if new commit is not made in 30 to 300 sec
         """
-        rpc_command = '<CLI><Configuration>commit'
+        rpc_command = '<Commit'
         if label:
-            rpc_command += ' label %s' % label
+            rpc_command += ' Label="%s"' % label
         if comment:
-            rpc_command += ' comment %s' % comment
+            rpc_command += ' Comment="%s"' % comment
         if confirmed:
             if 30 <= int(confirmed) <= 300:
-                rpc_command += ' confirmed %d' % int(confirmed)
+                rpc_command += ' Confirmed="%d"' % int(confirmed)
             else:
                 raise InvalidInputError('confirmed needs to be between 30 and 300 seconds', self)
-        rpc_command += '</Configuration></CLI>'
+        rpc_command += '/>'
 
         self._execute_rpc(rpc_command)
 
@@ -604,17 +604,17 @@ def commit_replace_config(self, label=None, comment=None, confirmed=None):
         :param label:     User label saved on this commit on the device
         :param confirmed: Commit with auto-rollback if new commit is not made in 30 to 300 sec
         """
-        rpc_command = '<CLI><Configuration>commit replace'
+        rpc_command = '<Commit Replace="true"'
         if label:
-            rpc_command += ' label %s' % label
+            rpc_command += ' Label="%s"' % label
         if comment:
-            rpc_command += ' comment %s' % comment
+            rpc_command += ' Comment="%s"' % comment
         if confirmed:
             if 30 <= int(confirmed) <= 300:
-                rpc_command += ' confirmed %d' % int(confirmed)
+                rpc_command += ' Confirmed="%d"' % int(confirmed)
             else:
                 raise InvalidInputError('confirmed needs to be between 30 and 300 seconds', self)
-        rpc_command += '</Configuration></CLI>'
+        rpc_command += '/>'
         self._execute_rpc(rpc_command)
 
     def discard_config(self):

diff --git a/test/mock/CLI_Configuration_commitConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commitConfiguration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_comment_emptyConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commit_comment_emptyConfiguration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_comment_goodConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commit_comment_goodConfiguration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_comment_parallelConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commit_comment_parallelConfiguration_CLI_.xml
diff --git a/...LI_Configuration_commit_comment_pyIOSXR-test_xml-agent-iteration-onConfiguration_CLI_.xml b/...LI_Configuration_commit_comment_pyIOSXR-test_xml-agent-iteration-onConfiguration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_confirmed_60Configuration_CLI_.xml b/test/mock/CLI_Configuration_commit_confirmed_60Configuration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_label_testConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commit_label_testConfiguration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_replaceConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commit_replaceConfiguration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_replace_comment_goodConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commit_replace_comment_goodConfiguration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_replace_confirmed_60Configuration_CLI_.xml b/test/mock/CLI_Configuration_commit_replace_confirmed_60Configuration_CLI_.xml
diff --git a/test/mock/CLI_Configuration_commit_replace_label_testConfiguration_CLI_.xml b/test/mock/CLI_Configuration_commit_replace_label_testConfiguration_CLI_.xml