From f80928f47dbd35f9dfe8884769fa51fcebf64771 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Jul 02 2018 18:51:45 +0000
Subject: Ticket 49795 - UI - add "action" backend funtionality


Description:  Added the backend functionality for all the items in the "Action"
              dropdown list on the banner.

              Added ability to use the instance name in dsconf, previously
              only ldap URLs worked.

              Added more helper functions:

                popup_confirm() - this now accepts html tags so nicer output
                get_ldapurl_from_serverid(server_id) - take an instance name
                  and generate a LDAP URL from its dse.ldif

              And of course did some code cleanup.

https://pagure.io/389-ds-base/issue/49795

Reviewed by: ?

---

diff --git a/src/cockpit/389-console/banner.html b/src/cockpit/389-console/banner.html
index 14d866f..f919ed8 100644
--- a/src/cockpit/389-console/banner.html
+++ b/src/cockpit/389-console/banner.html
@@ -1,15 +1,16 @@
-389 Directory Server Management <div class="dropdown ds-server-action"> <select class="btn btn-default dropdown ds-dropdown-server" id="select-server">
+389 Directory Server Management <div class="dropdown ds-server-action"> <select class="btn btn-default dropdown ds-dropdown-server"
+      title="Directory Server Instance List" id="select-server">
       </select></div><div class="dropdown ds-float-right"><button class="btn btn-primary dropdown-toggle ds-action-btn"
        type="button" id="server-list-menu" data-toggle="dropdown">Actions<span class="caret"></span>
       </button><ul class="dropdown-menu pull-right" role="menu">
         <li role=""><a role="menuitem" id="start-server-btn" href="#">Start Instance</a></li>
         <li role=""><a role="menuitem" id="stop-server-btn" href="#">Stop Instance</a></li>
         <li role=""><a role="menuitem" id="restart-server-btn" href="#">Restart Instance</a></li>
-        <li role=""><a role="menuitem" id="backup-server-btn" data-toggle="modal" data-target="#backup-form" href="#">Backup</a></li>
-        <li role=""><a role="menuitem" id="restore-server-btn" data-toggle="modal" data-target="#restore-form" href="#">Restore</a></li>
-        <li role=""><a role="menuitem" id="reload-schema-btn" href="#">Reload Schema Files</a></li>
-        <li role=""><a role="menuitem" id="remove-server-btn" href="#">Remove Instance</a></li>
+        <li role=""><a role="menuitem" id="backup-server-btn" data-toggle="modal" data-target="#backup-form" href="#">Perform Backup</a></li>
+        <li role=""><a role="menuitem" id="restore-server-btn" data-toggle="modal" data-target="#restore-form" href="#">Manage Backups</a></li>
+        <li role=""><a role="menuitem" id="reload-schema-btn" data-toggle="modal" data-target="#schema-reload-form" href="#">Reload Schema Files</a></li>
         <li class="divider"></li>
+        <li role=""><a role="menuitem" id="remove-server-btn" href="#">Remove Instance</a></li>
         <li role=""><a role="menuitem" id="create-server-btn" data-toggle="modal" data-target="#create-inst-form" href="#">Create Instance</a></li>
       </ul>
     </div>
diff --git a/src/cockpit/389-console/css/ds.css b/src/cockpit/389-console/css/ds.css
index e5d1adf..bf77a6b 100644
--- a/src/cockpit/389-console/css/ds.css
+++ b/src/cockpit/389-console/css/ds.css
@@ -683,14 +683,13 @@ Zbutton:focus {
   padding-bottom: 10px;
 }
 
-
 .ds-modal {
-  width: 650px;
+  width: 450px;
 }
 
 .ds-modal-wide {
   width: 850px;
-  z-index: 10;
+  vertical-align: middle;
 }
 
 .modal-content {
diff --git a/src/cockpit/389-console/index.html b/src/cockpit/389-console/index.html
index 5f69103..2c13122 100644
--- a/src/cockpit/389-console/index.html
+++ b/src/cockpit/389-console/index.html
@@ -42,7 +42,7 @@
     <nav class="navbar navbar-default" id="ds-navigation" role="navigation">
       <div class="collapse navbar-collapse navbar-collapse-5 ds-nav">
         <ul class="nav navbar-nav navbar-primary">
-    
+
           <!-- Server Config navtab -->
           <li class="dropdown ds-nav-tab">
             <a href="#0" class="dropdown-toggle ds-tab-list" data-toggle="dropdown" id="server-tab">
@@ -72,7 +72,7 @@
               </li>
             </ul>
           </li>
-    
+
           <!-- Security navtab -->
           <li class="dropdown ds-nav-tab">
             <a href="#0" class="dropdown-toggle ds-tab-list" data-toggle="dropdown" id="security-tab">
@@ -185,9 +185,113 @@
     </div>
   </div>
 
+  <div class="modal fade" id="restart-instance-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="restart-inst-label" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content ds-modal">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+            <span class="pficon pficon-close"></span>
+          </button>
+          <h4 class="modal-title" id="restart-inst-label">Restart Instance</h4>
+        </div>
+        <div class="modal-body">
+          <div id="reload-spinner" class="ds-center">
+            <p></p>
+            <p id="ds-restart-inst"><span class="spinner spinner-xs spinner-inline"></span> Restarting instance...</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade" id="stop-instance-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="stop-inst-label" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content ds-modal">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+            <span class="pficon pficon-close"></span>
+          </button>
+          <h4 class="modal-title" id="stop-inst-label">Stop Instance</h4>
+        </div>
+        <div class="modal-body">
+          <div id="reload-spinner" class="ds-center">
+            <p></p>
+            <p id="ds-stop-inst"><span class="spinner spinner-xs spinner-inline"></span> Stopping instance...</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade" id="start-instance-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="start-inst-label" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content ds-modal">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+            <span class="pficon pficon-close"></span>
+          </button>
+          <h4 class="modal-title" id="start-inst-label">Start Instance</h4>
+        </div>
+        <div class="modal-body">
+          <div id="reload-spinner" class="ds-center">
+            <p></p>
+            <p id="ds-start-inst"><span class="spinner spinner-xs spinner-inline"></span> Starting instance...</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade" id="remove-instance-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="remove-inst-label" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content ds-modal">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+            <span class="pficon pficon-close"></span>
+          </button>
+          <h4 class="modal-title" id="remove-inst-label">Remove Instance</h4>
+        </div>
+        <div class="modal-body">
+          <div id="reload-spinner" class="ds-center">
+            <p></p>
+            <p id="ds-remove-inst"><span class="spinner spinner-xs spinner-inline"></span> Removing instance...</p>
+          </div>
+        </div>>
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade" id="schema-reload-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="reload-label" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content ds-modal">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+            <span class="pficon pficon-close"></span>
+          </button>
+          <h4 class="modal-title" id="reload-label">Reload Schema Files</h4>
+        </div>
+        <div class="modal-body">
+          <form class="form-horizontal">
+            <label for="reload-dir" class="ds-config-label" title="The name of the database link.">Schema File Directory</label><input
+              class="ds-input" type="text" placeholder="Leave empty to use default schema location" id="reload-dir">
+          </form>
+          <div id="reload-spinner" class="ds-center" hidden>
+            <p></p>
+            <p><span class="spinner spinner-xs spinner-inline"></span> Reloading schema files...</p>
+          </div>
+        </div>
+        <div class="modal-footer ds-modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+          <button type="button" class="btn btn-primary" id ="schema-reload-btn">Reload Schema</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Restore from backup -->
   <div class="modal fade" id="restore-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="restore-label" aria-hidden="true">
-    <div class="modal-dialog ds-modal-wide">
-      <div class="modal-content">
+    <div class="modal-dialog">
+      <div class="modal-content ds-modal-wide">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
             <span class="pficon pficon-close"></span>
@@ -201,21 +305,22 @@
                 <tr class="ds-table-header">
                   <th>Backup Name</th>
                   <th>Date</th>
-                  <th></th>
+                  <th>Size</th>
+                  <th>Restore</th>
+                  <th>Delete</th>
                 </tr>
               </thead>
               <tbody id="restore-tbody">
-                <tr>
-                  <td>my_backup</td>
-                  <td>11/22/2018</td>
-                  <td><button class="btn btn-default restore-btn" type="button">Restore</button></td>
-                </tr>
               </tbody>
             </table>
           </form>
+          <div id="restore-spinner" class="ds-center" hidden>
+            <p></p>
+            <p><span class="spinner spinner-xs spinner-inline"></span> Restoring the server...</p>
+          </div>
         </div>
         <div class="modal-footer ds-modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+          <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
         </div>
       </div>
     </div>
@@ -279,10 +384,13 @@
           <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-primary" id="chaining-save">Create Link</button>
         </div>
-      </div> 
+      </div>
     </div>
   </div>
 
+  <!--
+      Create New Instance
+  -->
   <div class="modal fade" id="create-inst-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="create-inst-header" aria-hidden="true">
     <div class="modal-dialog ds-modal">
       <div class="modal-content animate">
@@ -330,7 +438,7 @@
               </div>
               <div>
                 <p></p>
-                <input type="checkbox" class="ds-config-checkbox" id="create-inst-tls"><label
+                <input type="checkbox" class="ds-config-checkbox" id="create-inst-tls" checked><label
                   for="create-inst-tls" class="ds-label" title="Create a self-signed certificate database">Create Self Signed Certificate DB</label>
               </div>
               <div id="create-inst-spinner" class="ds-center" hidden>
@@ -349,10 +457,12 @@
   </div>
 
 
-
+  <!--
+      Do Backup
+  -->
   <div class="modal fade" id="backup-form" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="backup-label" aria-hidden="true">
-    <div class="modal-dialog ds-modal-wide">
-      <div class="modal-content">
+    <div class="modal-dialog">
+      <div class="modal-content ds-modal">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
             <span class="pficon pficon-close"></span>
@@ -366,19 +476,20 @@
                 Backup Name</label><input class="ds-input ds-left-margin" type="text" id="backup-name"/>
             </div>
           </form>
+          <div id="backup-spinner" class="ds-center" hidden>
+            <p></p>
+            <p><span class="spinner spinner-xs spinner-inline"></span> Backing up the server...</p>
+          </div>
         </div>
         <div class="modal-footer ds-modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-          <button type="button" class="btn btn-primary" id="ds-backup-btn" data-dismiss="modal">Do Backup</button>
+          <button type="button" class="btn btn-primary" id="ds-backup-btn">Do Backup</button>
         </div>
       </div>
     </div>
   </div>
 
 
-
-
-
   <!-- The Nav Tabs  -->
 
   <div class="ds-content">
@@ -391,6 +502,9 @@
         <button type="button" class="btn btn-primary" id="no-inst-create-btn" data-toggle="modal" data-target="#create-inst-form">Create New Instance</button>
       </p>
     </div>
+    <div id="not-running" class="all-pages ds-center" hidden>
+      <h3>This server instance is not running, either start it from the <b>Actions</b> dropdown menu, or choose a different instance</h3>
+    </div>
 
     <div id="server-content" class="all-pages" hidden>
     </div>
diff --git a/src/cockpit/389-console/js/backend.js b/src/cockpit/389-console/js/backend.js
index 54f6ddf..03609e7 100644
--- a/src/cockpit/389-console/js/backend.js
+++ b/src/cockpit/389-console/js/backend.js
@@ -21,7 +21,7 @@ function customMenu (node) {
       "label": "Delete DB Link",
       "icon": "glyphicon glyphicon-trash",
       "action": function (data) {
-        bootpopup.confirm("Are you sure you want to delete this Database Link?", "Confirmation", function (yes) {  
+        popup_confirm("Are you sure you want to delete this Database Link?", "Confirmation", function (yes) {
           if (yes) {
     
            // TODO  Delete db link
@@ -52,7 +52,7 @@ function customMenu (node) {
        "label": "Reindex Suffix",
        "icon": "glyphicon glyphicon-wrench",
        "action": function (data) {
-         bootpopup.confirm("This will impact DB performance during the indexing.  Are you sure you want to reindex all attributes?", "Confirmation", function (yes) {  
+         popup_confirm("This will impact DB performance during the indexing.  Are you sure you want to reindex all attributes?", "Confirmation", function (yes) {
            if (yes) {
               // TODO Reindex suffix
            }
@@ -84,7 +84,7 @@ function customMenu (node) {
        "label": "Delete Suffix",
        "icon": "glyphicon glyphicon-remove",
        "action": function (data) {
-          bootpopup.confirm("Are you sure you want to delete suffix?", "Confirmation", function (yes) {  
+          popup_confirm("Are you sure you want to delete suffix?", "Confirmation", function (yes) {
             if (yes) {
               // TODO
             }
@@ -489,7 +489,7 @@ $(document).ready( function() {
       var data = ref_table.row( $(this).parents('tr') ).data();
       var del_ref_name = data[0];
       var ref_row = $(this); // Store element for callback
-      bootpopup.confirm("Are you sure you want to delete referral:  " + del_ref_name, "Confirmation", function (yes) {
+      popup_confirm("Are you sure you want to delete referral:  <b>" + del_ref_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete mapping from DS
 
@@ -800,7 +800,7 @@ $(document).ready( function() {
       var data = ref_table.row( $(this).parents('tr') ).data();
       var del_ref_name = data[0];
       var ref_row = $(this);
-      bootpopup.confirm("Are you sure you want to delete referral: " + del_ref_name, "Confirmation", function (yes) {  
+      popup_confirm("Are you sure you want to delete referral: " + del_ref_name, "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete ref
           ref_table.row( ref_row.parents('tr') ).remove().draw( false );
@@ -821,7 +821,7 @@ $(document).ready( function() {
       e.preventDefault();
       var data = index_table.row( $(this).parents('tr') ).data();
       var reindex_name = data[0];
-      bootpopup.confirm("Are you sure you want to reindex attribute: " + reindex_name, "Confirmation", function (yes) {  
+      popup_confirm("Are you sure you want to reindex attribute: <b>" + reindex_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO reindex attr
  
@@ -835,7 +835,7 @@ $(document).ready( function() {
       var del_index_name = data[0];
       var index_row = $(this);
 
-      bootpopup.confirm("Are you sure you want to delete index: " + del_index_name, "Confirmation", function (yes) {  
+      popup_confirm("Are you sure you want to delete index: <b>" + del_index_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete index
           index_table.row( index_row.parents('tr') ).remove().draw( false );
@@ -849,7 +849,7 @@ $(document).ready( function() {
       var data = attr_encrypt_table.row( $(this).parents('tr') ).data();
       var attr_name = data[0];
       var eattr_row = $(this);
-      bootpopup.confirm("Are you sure you want to delete encrypted attribute: " + attr_name, "Confirmation", function (yes) {  
+      popup_confirm("Are you sure you want to delete encrypted attribute: <b>" + attr_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete ref
           attr_encrypt_table.row( eattr_row.parents('tr') ).remove().draw( false );
@@ -860,39 +860,3 @@ $(document).ready( function() {
   });
 });
 
-
-
-/*
-
-
-Advanced:
-=====================
-nsslapd-mode: 600
-nsslapd-directory: /var/lib/dirsrv/slapd-localhost/db
-nsslapd-db-logdirectory: /var/lib/dirsrv/slapd-localhost/db
-nsslapd-db-home-directory
-nsslapd-db-compactdb-interval: 2592000
-nsslapd-db-locks: 10000
-nsslapd-db-checkpoint-interval: 60
-nsslapd-db-durable-transaction: on
-nsslapd-db-transaction-wait: off
-nsslapd-db-transaction-batch-val: 0
-nsslapd-db-transaction-batch-min-wait: 50
-nsslapd-db-transaction-batch-max-wait: 50
-nsslapd-db-logbuf-size: 0
-nsslapd-db-private-import-mem: on
-nsslapd-idl-switch: new
-nsslapd-search-bypass-filter-test: on
-nsslapd-search-use-vlv-index: on
-nsslapd-exclude-from-export:
-nsslapd-serial-lock: on
-nsslapd-subtree-rename-switch: on
-nsslapd-backend-opt-level: 1
-
-
-
-
-
-*/
-
-
diff --git a/src/cockpit/389-console/js/ds.js b/src/cockpit/389-console/js/ds.js
index 935d4da..830f4ae 100644
--- a/src/cockpit/389-console/js/ds.js
+++ b/src/cockpit/389-console/js/ds.js
@@ -1,15 +1,17 @@
 var DS_HOME = "/etc/dirsrv/";
 var server_id = "None";
+var server_inst = "";
 var dn_regex = new RegExp( "^([A-Za-z]+=.*)" );
 var config_values = {};
 //TODO - need "config_values" for all the other pages: SASL, backend, suffix, etc.
 
-// Used for local development testing
 var DSCONF = "dsconf";
 var DSCTL = "dsctl";
 var DSCREATE = "dscreate";
 var ENV = "";
+
 /*
+// Used for local development testing
 var DSCONF = '/home/mareynol/source/ds389/389-ds-base/src/lib389/cli/dsconf';
 var DSCTL = '/home/mareynol/source/ds389/389-ds-base/src/lib389/cli/dsctl';
 var DSCREATE = '/home/mareynol/source/ds389/389-ds-base/src/lib389/cli/dscreate';
@@ -69,26 +71,6 @@ function set_ports() {
   });
 }
 
-/* Example - remove eventually
- *
- * To test a local version of dsconf/lib389 use something like:
- *
- *     var cmd = ['/home/mareynol/source/ds389/389-ds-base/src/lib389/cli/dsconf',
- *               '-j', 'ldapi://%2fvar%2frun%2fslapd-' + server_id + '.socket','config',
- *               'replace'];
- *    cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": ["PYTHONPATH=/home/mareynol/source/ds389/389-ds-base/src/lib389"]}).done(function() {
- */
-function test_json_and_dsconf () {
-    var cmd = [DSCONF, '-j', 'ldapi://%2fvar%2frun%2fslapd-' + server_id + '.socket','backend', 'list']
-    cockpit.spawn(cmd, { superuser: true, "err": "message"}).done(function(data) {
-        console.log(data);
-        var obj = JSON.parse(data);
-        console.log("backend: " + obj['items']);
-    }).fail(function(data) {
-        console.log("failed: " + data.message);
-    });
-}
-
 function sort_list (sel) {
   var opts_list = sel.find('option');
   opts_list.sort(function(a, b) { return $(a).text() > $(b).text() ? 1 : -1; });
@@ -109,6 +91,7 @@ function set_no_insts () {
     select.appendChild(el);
     select.selectedIndex = "0";
     server_id = "";
+    server_inst = "";
 
     $("#server-list-menu").attr('disabled', true);
     $("#ds-navigation").hide();
@@ -117,7 +100,7 @@ function set_no_insts () {
 }
 
 function check_for_389 () {
-  var cmd = ["ls", "/etc/dirsrv"];
+  var cmd = ["rpm", "-q", "389-ds-base"];
 
   cockpit.spawn(cmd, { superuser: true }).fail(function(data) {
     $("#server-list-menu").attr('disabled', true);
@@ -127,6 +110,27 @@ function check_for_389 () {
   });
 }
 
+function check_inst_alive () {
+  // Check if this instance is started, if not hide configuration pages
+  cmd = ['status-dirsrv', server_inst];
+  console.log("MARK cmd: " + cmd);
+  cockpit.spawn(cmd, { superuser: true }).done(function () {
+    $(".all-pages").hide();
+    $("#ds-navigation").show();
+    $("#server-content").show();
+    $("#server-config").show();
+    //$("#no-instances").hide();
+    //$("#no-package").hide();
+    $("#not-running").hide();
+    console.log("Running");
+  }).fail(function(data) {
+    $("#ds-navigation").hide();
+    $(".all-pages").hide();
+    $("#not-running").show();
+    console.log("Not Running");
+  });
+}
+
 function get_insts() {
   var insts = [];
   var cmd = ["/bin/sh", "-c", "/usr/bin/ls -d " + DS_HOME + "slapd-*"];
@@ -175,6 +179,7 @@ function get_insts() {
       $("#server-content").show();
       $("#server-config").show();
       server_id = insts[0];
+      server_inst = insts[0].replace("slapd-", "");
       get_and_set_config();
     }
 
@@ -211,6 +216,23 @@ function popup_msg(title, msg) {
   });
 }
 
+function popup_confirm(msg, title, callback) {
+  if(typeof callback !== "function") {
+    callback = function() {};
+  }
+  var answer = false;
+  return bootpopup({
+    title: title,
+    content: [
+      msg
+    ],
+    showclose: false,
+    buttons: ["no", "yes"],
+    yes: function() { answer = true; },
+    dismiss: function() { callback(answer); }
+  });
+}
+
 function popup_success(msg) {
   $('#success-msg').html(msg);
   $('#success-form').modal('show');
@@ -234,7 +256,6 @@ function save_all () {
 function load_config (){
   // TODO - set all the pages
   get_and_set_config(); // cn=config stuff
-
 }
 
 $(window.document).ready(function() {
diff --git a/src/cockpit/389-console/js/replication.js b/src/cockpit/389-console/js/replication.js
index 74233d2..20596c9 100644
--- a/src/cockpit/389-console/js/replication.js
+++ b/src/cockpit/389-console/js/replication.js
@@ -220,7 +220,7 @@ $(document).ready( function() {
       if (role == "no-repl") {
         // This also means disable replication: delete agmts, everything
 
-        bootpopup.confirm("Are you sure you want to disable replication and remove all agreements?", "Confirmation", function (yes) {
+        popup_confirm("Are you sure you want to disable replication and remove all agreements?", "Confirmation", function (yes) {
           if (yes) {
             // TODO Delete attr from DS
 
@@ -367,7 +367,7 @@ $(document).ready( function() {
       e.preventDefault();
       var row = $(this).parent().parent(); //tr
       var repl_dn = row.children("td:nth-child(1)");
-      bootpopup.confirm("Are you sure you want to delete replication manager:  " + repl_dn.html(), "Confirmation", function (yes) {
+      popup_confirm("Are you sure you want to delete replication manager:  <b>" + repl_dn.html() + "</b>", "Confirmation", function (yes) {
         if (yes) {
           row.remove();
         }
@@ -383,7 +383,7 @@ $(document).ready( function() {
       var data = repl_agmt_table.row( $(this).parents('tr') ).data();
       var del_agmt_name = data[0];
       var agmt_row = $(this);
-      bootpopup.confirm("Are you sure you want to delete replication agreement: " + del_agmt_name, "Confirmation", function (yes) {
+      popup_confirm("Are you sure you want to delete replication agreement: <b>" + del_agmt_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete agmt
           repl_agmt_table.row( agmt_row.parents('tr') ).remove().draw( false );
@@ -711,7 +711,7 @@ $(document).ready( function() {
     $("#delete-repl-manager").on("click", function () {
       var repl_mgr_dn = $("#repl-managers-list").find('option:selected');
       if (repl_mgr_dn.val() !== undefined) {
-        bootpopup.confirm("Are you sure you want to delete replication manager: " + repl_mgr_dn.val(), "Confirmation", function (yes) {  
+        popup_confirm("Are you sure you want to delete replication manager: <b>" + repl_mgr_dn.val() + "</b>", "Confirmation", function (yes) {
           if (yes) {
             // TODO Update replica config entry, do not delete the real repl mgr entry
 
diff --git a/src/cockpit/389-console/js/schema.js b/src/cockpit/389-console/js/schema.js
index 75b7f04..87717ab 100644
--- a/src/cockpit/389-console/js/schema.js
+++ b/src/cockpit/389-console/js/schema.js
@@ -299,7 +299,7 @@ $(document).ready( function() {
       var data = at_table.row( $(this).parents('tr') ).data();
       var del_attr_name = data[0];
       var at_row = $(this);
-      bootpopup.confirm("Are you sure you want to delete attribute: " + del_attr_name, "Confirmation", function (yes) {
+      popup_confirm("Are you sure you want to delete attribute: <b>" + del_attr_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete attr from DS
 
@@ -337,7 +337,7 @@ $(document).ready( function() {
       var del_oc_name = data[0];
       var oc_row = $(this);
 
-      bootpopup.confirm("Are you sure you want to delete objectclass: " + del_oc_name, "Confirmation", function (yes) {
+      popup_confirm("Are you sure you want to delete objectclass: <b>" + del_oc_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete attr from DS
 
@@ -345,7 +345,6 @@ $(document).ready( function() {
           oc_table.row( oc_row.parents('tr') ).remove().draw( false );
         }
       });
-
     });
   });
 });
diff --git a/src/cockpit/389-console/js/servers.js b/src/cockpit/389-console/js/servers.js
index a6242bd..e9e9c3e 100644
--- a/src/cockpit/389-console/js/servers.js
+++ b/src/cockpit/389-console/js/servers.js
@@ -22,7 +22,7 @@ var local_pwp_html =
      '</ul>' +
    '</div>';
 
-var create_full_template = 
+var create_full_template =
   "[general]\n" +
   "config_version = 2\n" +
   "defaults = 999999999\n" +
@@ -59,7 +59,7 @@ var create_full_template =
   "sysconf_dir = /etc\n" +
   "tmp_dir = /tmp\n";
 
-var create_inf_template = 
+var create_inf_template =
   "[general]\n" +
   "config_version = 2\n" +
   "full_machine_name = FQDN\n\n" +
@@ -154,7 +154,7 @@ function clear_inst_form() {
   $("#create-inst-group").val("dirsrv");
   $("#rootdn-pw").val("");
   $("#rootdn-pw-confirm").val("");
-  $("#create-inst-tls").prop('checked', false);
+  $("#create-inst-tls").prop('checked', true);
   clear_inst_input();
 }
 
@@ -179,8 +179,10 @@ function get_and_set_config () {
         config_values[attr] = val;
       }
     }
+    check_inst_alive();
   }).fail(function(data) {
       console.log("failed: " + data.message);
+      check_inst_alive();
   });
 }
 
@@ -264,7 +266,7 @@ function save_config() {
 $(document).ready( function() {
   $("#main-banner").load("banner.html");
 
-  // Fill in the server instance dropdown  
+  // Fill in the server instance dropdown
   get_insts();
   check_for_389();
 
@@ -274,6 +276,7 @@ $(document).ready( function() {
     // Handle changing instance here
     $('#select-server').on("change", function() {
       server_id = $(this).val();
+      server_inst = server_id.replace("slapd-", "");
       load_config();
     });
 
@@ -283,8 +286,8 @@ $(document).ready( function() {
     $("#server-config").show();
 
     // To remove text border on firefox on dropdowns)
-    if(navigator.userAgent.toLowerCase().indexOf('firefox') > -1) {  
-      $("select").focus( function() {      
+    if(navigator.userAgent.toLowerCase().indexOf('firefox') > -1) {
+      $("select").focus( function() {
         this.style.setProperty( 'outline', 'none', 'important' );
         this.style.setProperty( 'color', 'rgba(0,0,0,0)', 'important' );
         this.style.setProperty( 'text-shadow', '0 0 0 #000', 'important' );
@@ -425,7 +428,7 @@ $(document).ready( function() {
         var data = sasl_table.row( $(this).parents('tr') ).data();
         var del_sasl_name = data[0];
         var sasl_row = $(this); // Store element for callback
-        bootpopup.confirm("Are you sure you want to delete sasl mapping: " + del_sasl_name, "Confirmation", function (yes) {
+        popup_confirm("Are you sure you want to delete sasl mapping: <b>" + del_sasl_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete mapping from DS
 
@@ -615,7 +618,7 @@ $(document).ready( function() {
     });
 
     $("#nsslapd-ldapiautobind").change(function() {
-      if (this.checked){ 
+      if (this.checked){
         $(".autobind-attrs").show();
         if ( $("#nsslapd-ldapimaptoentries").is(":checked") ){
           $(".autobind-entry-attrs").show();
@@ -648,9 +651,16 @@ $(document).ready( function() {
         "search": "Search Backups"
       },
       "columnDefs": [ {
-        "targets": 2,
+        "targets": [3, 4],
         "orderable": false
-      } ]
+      } ],
+      "columns": [
+        { "width": "120px" },
+        { "width": "80px" },
+        { "width": "30px" },
+        { "width": "40px" },
+        { "width": "30px" }
+      ],
     });
 
     // Set up local passwd policy table
@@ -674,26 +684,26 @@ $(document).ready( function() {
       // Get the values
       var pwp_track = "off";
       if ( $("#passwordtrackupdatetime").is(":checked") ) {
-        pwp_track = "on"; 
+        pwp_track = "on";
       }
       var pwp_admin = $("#passwordadmindn").val();
       var pwp_passwordchange = "off";
       if ($("#passwordchange").is(":checked") ){
-        pwp_passwordchange = "on"; 
+        pwp_passwordchange = "on";
       }
       var pwp_passwordmustchange = "off";
       if ($("#passwordmustchange").is(":checked") ){
-        pwp_passwordmustchange = "on"; 
+        pwp_passwordmustchange = "on";
       }
       var pwp_history = "off";
       if ($("#passwordhistory").is(":checked") ){
-        pwp_history = "on"; 
+        pwp_history = "on";
       }
       var pwp_inhistory = $("#passwordinhistory").val();
       var pwp_minage = $("#passwordminage").val();
       var pwp_exp = "off";
       if ($("#passwordexp").is(":checked") ){
-        pwp_exp = "on"; 
+        pwp_exp = "on";
       }
       var pwp_maxage = $("#passwordmaxage").val();
       var pwp_gracelimit = $("#passwordgracelimit").val();
@@ -701,22 +711,22 @@ $(document).ready( function() {
 
       var pwp_sendexp = "off";
       if ($("#passwordsendexpiringtime").is(":checked") ){
-        pwp_sendexp = "on"; 
+        pwp_sendexp = "on";
       }
       var pwp_lockout = "off";
       if ($("#passwordlockout").is(":checked") ){
-        pwp_lockout = "on"; 
+        pwp_lockout = "on";
       }
       var pwp_maxfailure = $("#passwordmaxfailure").val();
       var pwp_failcount = $("#passwordresetfailurecount").val();
       var pwp_unlock = "off";
       if ($("#passwordunlock").is(":checked") ){
-        pwp_unlock = "on"; 
+        pwp_unlock = "on";
       }
       var pwp_lockoutdur = $("#passwordlockoutduration").val();
       var pwp_checksyntax = "off";
       if ($("#passwordchecksyntax").is(":checked") ){
-        pwp_checksyntax = "on"; 
+        pwp_checksyntax = "on";
       }
       var pwp_minlen = $("#passwordminlength").val();
       var pwp_mindigit = $("#passwordmindigits").val();
@@ -731,7 +741,7 @@ $(document).ready( function() {
 
       // TODO  - save to DS
 
-    } 
+    }
     /*
      *  Modal Forms
      */
@@ -745,26 +755,26 @@ $(document).ready( function() {
       var policy_name = $("#local-entry-dn").val();
       var pwp_track = "off";
       if ( $("#local-passwordtrackupdatetime").is(":checked") ) {
-        pwp_track = "on"; 
+        pwp_track = "on";
       }
       var pwp_admin = $("#local-passwordadmindn").val();
       var pwp_passwordchange = "off";
       if ($("#local-passwordchange").is(":checked") ){
-        pwp_passwordchange = "on"; 
+        pwp_passwordchange = "on";
       }
       var pwp_passwordmustchange = "off";
       if ($("#local-passwordmustchange").is(":checked") ){
-        pwp_passwordmustchange = "on"; 
+        pwp_passwordmustchange = "on";
       }
       var pwp_history = "off";
       if ($("#local-passwordhistory").is(":checked") ){
-        pwp_history = "on"; 
+        pwp_history = "on";
       }
       var pwp_inhistory = $("#local-passwordinhistory").val();
       var pwp_minage = $("#local-passwordminage").val();
       var pwp_exp = "off";
       if ($("#local-passwordexp").is(":checked") ){
-        pwp_exp = "on"; 
+        pwp_exp = "on";
       }
       var pwp_maxage = $("#local-passwordmaxage").val();
       var pwp_gracelimit = $("#local-passwordgracelimit").val();
@@ -772,22 +782,22 @@ $(document).ready( function() {
 
       var pwp_sendexp = "off";
       if ($("#local-passwordsendexpiringtime").is(":checked") ){
-        pwp_sendexp = "on"; 
+        pwp_sendexp = "on";
       }
       var pwp_lockout = "off";
       if ($("#local-passwordlockout").is(":checked") ){
-        pwp_lockout = "on"; 
+        pwp_lockout = "on";
       }
       var pwp_maxfailure = $("#local-passwordmaxfailure").val();
       var pwp_failcount = $("#local-passwordresetfailurecount").val();
       var pwp_unlock = "off";
       if ($("#local-passwordunlock").is(":checked") ){
-        pwp_unlock = "on"; 
+        pwp_unlock = "on";
       }
       var pwp_lockoutdur = $("#local-passwordlockoutduration").val();
       var pwp_checksyntax = "off";
       if ($("#local-passwordchecksyntax").is(":checked") ){
-        pwp_checksyntax = "on"; 
+        pwp_checksyntax = "on";
       }
       var pwp_minlen = $("#local-passwordminlength").val();
       var pwp_mindigit = $("#local-passwordmindigits").val();
@@ -803,7 +813,7 @@ $(document).ready( function() {
 
       var pwp_type = "User Password Policy";
       if ( $("#subtree-pwp-radio").is(":checked")) {
-        pwp_type = "Subtree Password Policy"; 
+        pwp_type = "Subtree Password Policy";
       }
 
       // TODO - add to DS
@@ -819,7 +829,7 @@ $(document).ready( function() {
       $("#local-pwp-form").modal('toggle');
       clear_local_pwp_form();
     });
-    
+
     // Delete local password policy
     $(document).on('click', '.delete-local-pwp', function(e) {
       e.preventDefault();
@@ -828,7 +838,7 @@ $(document).ready( function() {
       var data = pwp_table.row( $(this).parents('tr') ).data();
       var del_pwp_name = data[0];
       var pwp_row = $(this);
-      bootpopup.confirm("Are you sure you want to delete local password policy: " + del_pwp_name, "Confirmation", function (yes) {
+      popup_confirm("Are you sure you want to delete local password policy: <b>" + del_pwp_name + "</b>", "Confirmation", function (yes) {
         if (yes) {
           // TODO Delete pwp from DS
 
@@ -837,7 +847,7 @@ $(document).ready( function() {
         }
       });
     });
- 
+
     // SASL Mappings Form
     $("#sasl-map-save").on("click", function() {
       var sasl_name = $("#sasl-map-name").val();
@@ -863,8 +873,188 @@ $(document).ready( function() {
       $("#sasl-map-form").modal('toggle');
     });
 
+    /*
+     *  Stop, Start, and Restart server
+     */
+    $("#start-server-btn").on("click", function () {
+      $("#ds-start-inst").html("<span class=\"spinner spinner-xs spinner-inline\"></span> Starting instance <b>" + server_id + "</b>...");
+      $("#start-instance-form").modal('toggle');
+      var cmd = [DSCTL, server_inst, 'start'];
+      cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+        $("#start-instance-form").modal('toggle');
+        load_config();
+        popup_success("Started instance \"" + server_id + "\"");
+      }).fail(function(data) {
+        $("#start-instance-form").modal('toggle');
+        popup_err("Error", "Failed to start instance \"" + server_id + "\"\n" + data.message);
+      });
+    });
+
+    $("#stop-server-btn").on("click", function () {
+      $("#ds-stop-inst").html("<span class=\"spinner spinner-xs spinner-inline\"></span> Stopping instance <b>" + server_id + "</b>...");
+      $("#stop-instance-form").modal('toggle');
+      var cmd = [DSCTL, server_inst, 'stop'];
+      cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+        $("#stop-instance-form").modal('toggle');
+        popup_success("Stopped instance \"" + server_id + "\"");
+        check_inst_alive();
+      }).fail(function(data) {
+        $("#stop-instance-form").modal('toggle');
+        popup_err("Error", "Failed to stop instance \"" + server_id + "\"\n" + data.message);
+        check_inst_alive();
+      });
+    });
+
+    $("#restart-server-btn").on("click", function () {
+      $("#ds-restart-inst").html("<span class=\"spinner spinner-xs spinner-inline\"></span> Retarting instance <b>" + server_id + "</b>...");
+      $("#restart-instance-form").modal('toggle');
+      var cmd = [DSCTL, server_inst, 'restart'];
+      cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+        $("#restart-instance-form").modal('toggle');
+        load_config();
+        popup_success("Restarted instance \"" + server_id + "\"");
+      }).fail(function(data) {
+        $("#restart-instance-form").modal('toggle');
+        popup_err("Error", "Failed to restart instance \"" + server_id + "\"\n" + data.message);
+      });
+    });
+
+    /* Backup server */
+    $("#ds-backup-btn").on('click', function () {
+      var backup_name = $("#backup-name").val();
+      if (backup_name == ""){
+        popup_msg("Error", "Backup must have a name");
+        return;
+      }
+      if (backup_name.indexOf(' ') >= 0) {
+        popup_msg("Error", "Backup name can not contain any spaces");
+        return;
+      }
+      if (backup_name.startsWith('/')) {
+        popup_msg("Error", "Backup name can not start with a forward slash.  Backups are written to the server's backup directory (nsslapd-bakdir)");
+        return;
+      }
+      var cmd = [DSCTL, server_inst, 'db2bak', backup_name];
+      $("#backup-spinner").show();
+      cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+        $("#backup-spinner").hide();
+        popup_success("Backup has been created");
+        $("#backup-form").modal('toggle');
+      }).fail(function(data) {
+        $("#backup-spinner").hide();
+        popup_err("Error", "Failed to backup the server\n" + data.message);
+      });
+    });
+
+    $("#backup-server-btn").on('click', function () {
+      $("#backup-name").val("");
+    });
+
+    /* Restore.  load restore table with current backups */
+    $("#restore-server-btn").on('click', function () {
+      var cmd = [DSCTL, server_id, '-j', 'backups'];
+      cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+        var backup_btn = "<button class=\"btn btn-default restore-btn\" type=\"button\">Restore</button>";
+        var del_btn =  "<button title=\"Delete backup directory\" class=\"btn btn-default ds-del-backup-btn\" type=\"button\"><span class='glyphicon glyphicon-trash'></span></button>";
+        var obj = JSON.parse(data);
+        backup_table.clear().draw( false );
+        for (var i = 0; i < obj.items.length; i++) {
+          var backup_name = obj.items[i][0];
+          var backup_date = obj.items[i][1];
+          var backup_size = obj.items[i][2];
+          backup_table.row.add([backup_name, backup_date, backup_size, backup_btn, del_btn]).draw( false );
+        }
+      }).fail(function(data) {
+        popup_err("Error", "Failed to get list of backups\n" + data.message);
+      });
+    });
+
+    /* Restore server */
+    $(document).on('click', '.restore-btn', function(e) {
+      e.preventDefault();
+      var data = backup_table.row( $(this).parents('tr') ).data();
+      var restore_name = data[0];
+      popup_confirm("Are you sure you want to restore this backup:  <b>" + restore_name + "<b>", "Confirmation", function (yes) {
+        if (yes) {
+          var cmd = [DSCTL, server_inst, 'bak2db', restore_name];
+          $("#restore-spinner").show();
+          cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+            popup_success("The backup has been restored");
+            $("#restore-spinner").hide();
+            $("#restore-form").modal('toggle');
+          }).fail(function(data) {
+            $("#restore-spinner").hide();
+            popup_err("Error", "Failed to restore from the backup\n" + data.message);
+          });
+        }
+      });
+    });
+
+    /* Delete backup directory */
+    $(document).on('click', '.ds-del-backup-btn', function(e) {
+      e.preventDefault();
+      var data = backup_table.row( $(this).parents('tr') ).data();
+      var restore_name = data[0];
+      var backup_row = $(this);
+      popup_confirm("Are you sure you want to delete this backup: <b>" + restore_name + "</b>", "Confirmation", function (yes) {
+        if (yes) {
+          var cmd = [DSCTL, server_inst, 'backups', '--delete', restore_name];
+          $("#restore-spinner").show();
+          cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+            $("#restore-spinner").hide();
+            backup_table.row( backup_row.parents('tr') ).remove().draw( false );
+            popup_success("The backup has been deleted");
+          }).fail(function(data) {
+            $("#restore-spinner").hide();
+            popup_err("Error", "Failed to delete the backup\n" + data.message);
+          });
+        }
+      });
+    });
+
+    /* reload schema */
+    $("#schema-reload-btn").on("click", function () {
+      var schema_dir = $("#reload-dir").val();
+      if (schema_dir != ""){
+        var cmd = [DSCONF, server_id, 'schema', 'reload', '--schemadir', schema_dir, '--wait'];
+      } else {
+        var cmd = [DSCONF, server_id, 'schema', 'reload', '--wait'];
+      }
+      $("#reload-spinner").show();
+      cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+        popup_msg("Success", "Successfully reloaded schema");  // TODO use timed interval success msg (waiting for another PR top be merged before we can add it)
+        $("#schema-reload-form").modal('toggle');
+        $("#reload-spinner").hide();
+      }).fail(function(data) {
+        popup_err("Error", "Failed to reload schema files\n" + data.message);
+        $("#reload-spinner").hide();
+      });
+    });
+
+
+    // Remove instance
+    $("#remove-server-btn").on("click", function () {
+      popup_confirm("Are you sure you want to this remove instance: <b>" + server_id + "</b>", "Confirmation", function (yes) {
+        if (yes) {
+          var cmd = [DSCTL, server_id, "remove", "--doit"];
+          $("#ds-remove-inst").html("<span class=\"spinner spinner-xs spinner-inline\"></span> Removing instance <b>" + server_id + "</b>...");
+          $("#remove-instance-form").modal('toggle');
+          cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+            $("#remove-instance-form").modal('toggle');
+            popup_msg("Success", "Instance has been deleted");
+            get_insts();
+            check_for_389();
+            load_config();
+          }).fail(function(data) {
+            $("#remove-instance-form").modal('toggle');
+            popup_err("Error", "Failed to remove instance\n" + data.message);
+          });
+        }
+      });
+    });
+
     // Create instance form
-    $("#create-server-btn").on("click", function() {;
+    $("#create-server-btn").on("click", function() {
       clear_inst_form();
       set_ports();
     });
@@ -979,7 +1169,7 @@ $(document).ready( function() {
         // Failed to get FQDN
         popup_err("Failed to get hostname!", ex.message);
       }).done(function (data){
-        /* 
+        /*
          * We have FQDN, so set the hostname in inf file, and create the setup file
          */
         setup_inf = setup_inf.replace('FQDN', data);
@@ -1001,7 +1191,7 @@ $(document).ready( function() {
             popup_err("Failed to set permission on setup file " + setup_file + ": ", ex.message);
           }).done(function (){
             /*
-             * Success we have our setup file and it has the correct permissions.  
+             * Success we have our setup file and it has the correct permissions.
              * Now populate the setup file...
              */
             var cmd = ["/bin/sh", "-c", '/usr/bin/echo -e "' + setup_inf + '" >> ' + setup_file];
@@ -1009,7 +1199,7 @@ $(document).ready( function() {
               // Failed to populate setup file
               popup_err("Failed to populate installation file!", ex.message);
             }).done(function (){
-              /* 
+              /*
                * Next, create the instance...
                */
               cmd = [DSCREATE, 'install', setup_file];
@@ -1022,41 +1212,19 @@ $(document).ready( function() {
                 // Success!!!  Now cleanup everything up...
                 cockpit.spawn(rm_cmd, { superuser: true });  // Remove Inf file with clear text password
                 $("#create-inst-spinner").hide();
-                $("#server-list-menu").attr('disabled', false); 
+                $("#server-list-menu").attr('disabled', false);
                 $("#no-instances").hide();
                 get_insts();  // Refresh server list
                 popup_msg("Success!", "Successfully created instance:  <b>slapd-" + new_server_id + "</b>", );
                 $("#create-inst-form").modal('toggle');
               });
-            }); 
+            });
             $("#create-inst-spinner").show();
           });
         });
       });
     });
 
-    $("#backup-save").on("click", function() {
-      // TODO - Do backup
-
-      $("#backup-form").modal('toggle');
-    });
-
-    $(document).on('click', '.restore-btn', function(e) {
-      e.preventDefault();
-      // Backend name is inside input of table cell
-      //var backup_name = $(this).parents('tr').find('input').val();
-      var data = backup_table.row( $(this).parents('tr') ).data();
-      var backup_name = data[0];
-
-      bootpopup.confirm("Are you sure you want to restore: " + backup_name, "Confirmation", function (yes) {
-        // TODO Do the restore
-        if (yes) {
-          // TODO - the restore operation
-          $("#restore-form").modal('toggle');
-        }
-      });
-     });
-
     // Accordion opening/closings
     $(".ds-accordion-panel").css('display','none');
 
diff --git a/src/cockpit/389-console/replication.html b/src/cockpit/389-console/replication.html
index 9294d48..955405b 100644
--- a/src/cockpit/389-console/replication.html
+++ b/src/cockpit/389-console/replication.html
@@ -284,7 +284,7 @@ CleanAllRUV Tasks
 
 
   <div class="modal fade" id="agmt-form" data-backdrop="static" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="agmt-wizard-title" aria-hidden="true">
-    <div class="modal-dialog ds-modal">
+    <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
@@ -351,7 +351,7 @@ CleanAllRUV Tasks
             <p></p>
             <button class="accordion ds-accordion" id="frac-accordion" type="button">&#9658 Show Fractional Settings</button>
             <div class="ds-accordion-panel">
-              <h4>Excluded Attributes</h4>
+              <p><b>Excluded Attributes</b></p>
               <div class="ds-container">
                 <div>
                   <form>
@@ -370,7 +370,8 @@ CleanAllRUV Tasks
                 </div>
               </div>
 
-              <h4>Excluded Attributes From Total Initializations</h4>
+              <hr>
+              <p><b>Excluded Attributes From Total Initializations</b></p>
               <div class="ds-container">
                 <div>
                   <form>
@@ -389,7 +390,8 @@ CleanAllRUV Tasks
                 </div>
               </div>
     
-              <h4>Strip Attributes</h4>
+              <hr>
+              <p><b>Strip Attributes</b></p>
               <div class="ds-container">
                 <div>
                   <form>
@@ -418,7 +420,8 @@ CleanAllRUV Tasks
               <div id="agmt-schedule-panel">
                 <div class="ds-container" id="schedule-settings" hidden>
                   <div class="ds-fractional-panel">
-                    <h4>Days to keep replication in sync</h4>
+                    <hr>
+                    <b>Days to keep replication in sync</b>
                     <div class="ds-container">
                       <div class="ds-inline">
                         <div>
@@ -456,14 +459,16 @@ CleanAllRUV Tasks
                     </div>
                   </div>
                   <div class="ds-fractional-panel">
-                    <h4>Replication Time Range</h4>
-                    <div class="ds-inline ds-left-margin">
-                      <div>
-                        <label for="agmt-start-time" class="ds-config-label-med">Start Time</label><input class="timepicker ds-agmt-schedule-timeZ" name="start" id="agmt-start-time" size="4"/>
-                      </div>
-                      <div>
-                      <div>
-                        <label for="agmt-start-time" class="ds-config-label-med">End Time</label><input class="timepicker ds-agmt-schedule-timeZ" name="start" id="agmt-end-time" size="4"/>
+                    <hr>
+                    <b>Replication Time Range</b>
+                    <div class="ds-container">
+                      <div class="ds-inline ds-left-margin">
+                        <div>
+                          <label for="agmt-start-time" class="ds-config-label-med">Start Time</label><input class="timepicker" name="start" id="agmt-start-time" size="4"/>
+                        </div>
+                        <div>
+                          <label for="agmt-start-time" class="ds-config-label-med">End Time</label><input class="timepicker" name="start" id="agmt-end-time" size="4"/>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -471,7 +476,6 @@ CleanAllRUV Tasks
               </div>
             </div>
           </div>
-        </div>
         <div class="modal-footer ds-modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-primary" id="agmt-save">Create Agreement</button>
diff --git a/src/cockpit/389-console/rhds-banner.html b/src/cockpit/389-console/rhds-banner.html
index 5496081..fef8826 100644
--- a/src/cockpit/389-console/rhds-banner.html
+++ b/src/cockpit/389-console/rhds-banner.html
@@ -1,15 +1,16 @@
-Red Hat Directory Server Management <div class="dropdown ds-server-action"> <select class="btn btn-default dropdown ds-dropdown-server" id="select-server">
+Red Hat Directory Server Management <div class="dropdown ds-server-action"> <select class="btn btn-default dropdown ds-dropdown-server"
+      title="Directory Server Instance List" id="select-server">
       </select></div><div class="dropdown ds-float-right"><button class="btn btn-primary dropdown-toggle ds-action-btn"
        type="button" id="server-list-menu" data-toggle="dropdown">Actions<span class="caret"></span>
       </button><ul class="dropdown-menu pull-right" role="menu">
         <li role=""><a role="menuitem" id="start-server-btn" href="#">Start Instance</a></li>
         <li role=""><a role="menuitem" id="stop-server-btn" href="#">Stop Instance</a></li>
         <li role=""><a role="menuitem" id="restart-server-btn" href="#">Restart Instance</a></li>
-        <li role=""><a role="menuitem" id="backup-server-btn" data-toggle="modal" data-target="#backup-form" href="#">Backup</a></li>
-        <li role=""><a role="menuitem" id="restore-server-btn" data-toggle="modal" data-target="#restore-form" href="#">Restore</a></li>
-        <li role=""><a role="menuitem" id="reload-schema-btn" href="#">Reload Schema Files</a></li>
-        <li role=""><a role="menuitem" id="remove-server-btn" href="#">Remove Instance</a></li>
+        <li role=""><a role="menuitem" id="backup-server-btn" data-toggle="modal" data-target="#backup-form" href="#">Perform Backup</a></li>
+        <li role=""><a role="menuitem" id="restore-server-btn" data-toggle="modal" data-target="#restore-form" href="#">Manage Backups</a></li>
+        <li role=""><a role="menuitem" id="reload-schema-btn" data-toggle="modal" data-target="#schema-reload-form" href="#">Reload Schema Files</a></li>
         <li class="divider"></li>
+        <li role=""><a role="menuitem" id="remove-server-btn" href="#">Remove Instance</a></li>
         <li role=""><a role="menuitem" id="create-server-btn" data-toggle="modal" data-target="#create-inst-form" href="#">Create Instance</a></li>
       </ul>
     </div>
\ No newline at end of file
diff --git a/src/lib389/lib389/__init__.py b/src/lib389/lib389/__init__.py
index 590d930..2153bc6 100644
--- a/src/lib389/lib389/__init__.py
+++ b/src/lib389/lib389/__init__.py
@@ -53,6 +53,7 @@ import errno
 import pwd
 import grp
 import uuid
+import json
 from shutil import copy2
 try:
     # There are too many issues with this on EL7
@@ -764,6 +765,8 @@ class DirSrv(SimpleLDAPObject, object):
         # Don't need a default value now since it's set in init.
         if serverid is None and hasattr(self, 'serverid'):
             serverid = self.serverid
+        else:
+            serverid = serverid.replace('slapd-', '')
 
         # first identify the directories we will scan
         sysconfig_head = self.ds_paths.initconfig_dir
@@ -1055,6 +1058,7 @@ class DirSrv(SimpleLDAPObject, object):
 
         if not uri:
             uri = self.toLDAPURL()
+
         self.log.debug('open(): Connecting to uri %s' % uri)
         if hasattr(ldap, 'PYLDAP_VERSION') and MAJOR >= 3:
             super(DirSrv, self).__init__(uri, bytes_mode=False, trace_level=TRACE_LEVEL)
@@ -2996,6 +3000,35 @@ class DirSrv(SimpleLDAPObject, object):
 
         return True
 
+    def backups(self, use_json):
+        # Return a list of backups from the bakdir
+        bakdir = self.get_bak_dir()
+        dirlist = [item for item in os.listdir(bakdir) if os.path.isdir(os.path.join(bakdir, item))]
+        if use_json:
+            json_result = {'type': 'list', 'items': []}
+        for backup in dirlist:
+            bak = bakdir + "/" + backup
+            bak_date = os.path.getctime(bak)
+            bak_date = datetime.fromtimestamp(bak_date).strftime('%Y-%m-%d %H:%M:%S')
+            bak_size = subprocess.check_output(['du', '-sh', bak]).split()[0].decode('utf-8')
+            if use_json:
+                json_item = [backup, bak_date, bak_size]
+                json_result['items'].append(json_item)
+            else:
+                self.log.info('Backup: {} - {} ({})'.format(bak, bak_date, bak_size))
+
+        if use_json:
+            print(json.dumps(json_result))
+
+        return True
+
+    def del_backup(self, bak_dir):
+        # Delete backup directory
+        bakdir = self.get_bak_dir()
+        del_dir = bakdir + "/" + bak_dir
+        self.log.debug("Deleting backup directory: " + del_dir)
+        shutil.rmtree(del_dir)
+
     def dbscan(self, bename=None, index=None, key=None, width=None, isRaw=False):
         """Wrapper around dbscan tool that analyzes and extracts information
         from an import Directory Server database file
diff --git a/src/lib389/lib389/cli_base/__init__.py b/src/lib389/lib389/cli_base/__init__.py
index 537b9f7..d2222d3 100644
--- a/src/lib389/lib389/cli_base/__init__.py
+++ b/src/lib389/lib389/cli_base/__init__.py
@@ -13,7 +13,7 @@ import ldap
 
 from getpass import getpass
 from lib389 import DirSrv
-from lib389.utils import assert_c
+from lib389.utils import assert_c, get_ldapurl_from_serverid
 from lib389.properties import *
 
 MAJOR, MINOR, _, _, _ = sys.version_info
@@ -86,13 +86,26 @@ def _warn(data, msg=None):
     return data
 
 
-# We'll need another of these that does a "connect via instance name?"
 def connect_instance(dsrc_inst, verbose):
     dsargs = dsrc_inst['args']
+    if '//' not in dsargs['ldapurl']:
+        # We have an instance name - generate url from dse.ldif
+        ldapurl, certdir = get_ldapurl_from_serverid(dsargs['ldapurl'])
+        if ldapurl is not None:
+            dsargs['ldapurl'] = ldapurl
+            if 'ldapi://' in ldapurl:
+                dsargs['ldapi_enabled'] = 'on'
+                dsargs['ldapi_socket'] = ldapurl.replace('ldapi://', '')
+                dsargs['ldapi_autobind'] = 'on'
+            elif 'ldaps://' in ldapurl:
+                dsrc_inst['tls_cert'] = certdir
+        else:
+            # The instance name does not match any instances
+            raise ValueError("Could not find configuration for instance: " + dsargs['ldapurl'])
     ds = DirSrv(verbose=verbose)
     ds.allocate(dsargs)
     if not ds.can_autobind() and dsrc_inst['binddn'] is not None:
-        dsargs[SER_ROOT_PW] = getpass("Enter password for %s on %s : " % (dsrc_inst['binddn'], dsrc_inst['uri']))
+        dsargs[SER_ROOT_PW] = getpass("Enter password for {} on {}: ".format(dsrc_inst['binddn'], dsrc_inst['uri']))
     elif not ds.can_autobind() and dsrc_inst['binddn'] is None:
         raise Exception("Must provide a binddn to connect with")
     ds.allocate(dsargs)
diff --git a/src/lib389/lib389/cli_conf/schema.py b/src/lib389/lib389/cli_conf/schema.py
index cfa097f..93e0716 100644
--- a/src/lib389/lib389/cli_conf/schema.py
+++ b/src/lib389/lib389/cli_conf/schema.py
@@ -74,8 +74,16 @@ def reload_schema(inst, basedn, log, args):
     schema = Schema(inst)
     log.info('Attempting to add task entry... This will fail if Schema Reload plug-in is not enabled.')
     task = schema.reload(args.schemadir)
-    log.info('Successfully added task entry ' + task.dn)
-    log.info("To verify that the schema reload operation was successful, please check the error logs.")
+    if args.wait:
+        task.wait()
+        rc = task.get_exit_code()
+        if rc == 0:
+            log.info("Schema reload task ({}) successfully finished.".format(task.dn))
+        else:
+            raise ValueError("Schema reload task failed, please check the errors log for more information")
+    else:
+        log.info('Successfully added task entry ' + task.dn)
+        log.info("To verify that the schema reload operation was successful, please check the error logs.")
 
 
 def create_parser(subparsers):
@@ -100,6 +108,7 @@ def create_parser(subparsers):
     reload_parser = subcommands.add_parser('reload', help='Dynamically reload schema while server is running')
     reload_parser.set_defaults(func=reload_schema)
     reload_parser.add_argument('-d', '--schemadir', help="directory where schema files are located")
+    reload_parser.add_argument('--wait', action='store_true', default=False, help="Wait for the reload task to complete")
 
     list_matchingrules_parser = subcommands.add_parser('list_matchingrules', help='List avaliable matching rules on this system')
     list_matchingrules_parser.set_defaults(func=list_matchingrules)
diff --git a/src/lib389/lib389/cli_ctl/dbtasks.py b/src/lib389/lib389/cli_ctl/dbtasks.py
index 1b6c370..7854fbe 100644
--- a/src/lib389/lib389/cli_ctl/dbtasks.py
+++ b/src/lib389/lib389/cli_ctl/dbtasks.py
@@ -51,6 +51,21 @@ def dbtasks_ldif2db(inst, log, args):
         log.info("ldif2db successful")
 
 
+def dbtasks_backups(inst, log, args):
+    if args.delete:
+        # Delete backup
+        inst.del_backup(args.delete)
+    else:
+        # list backups
+        if not inst.backups(args.json):
+            log.fatal("Failed to get list of backups")
+            return False
+        else:
+            if args.json is None:
+                log.info("backups successful")
+
+
+
 def create_parser(subcommands):
     db2index_parser = subcommands.add_parser('db2index', help="Initialise a reindex of the server database. The server must be stopped for this to proceed.")
     # db2index_parser.add_argument('suffix', help="The suffix to reindex. IE dc=example,dc=com.")
@@ -80,3 +95,6 @@ def create_parser(subcommands):
     ldif2db_parser.add_argument('--encrypted', help="Import encrypted attributes", default=False, action='store_true')
     ldif2db_parser.set_defaults(func=dbtasks_ldif2db)
 
+    backups_parser = subcommands.add_parser('backups', help="List backup's found in the server's default backup directory")
+    backups_parser.add_argument('--delete', help="Delete backup directory")
+    backups_parser.set_defaults(func=dbtasks_backups)
diff --git a/src/lib389/lib389/config.py b/src/lib389/lib389/config.py
index cec87e8..b462585 100644
--- a/src/lib389/lib389/config.py
+++ b/src/lib389/lib389/config.py
@@ -20,6 +20,7 @@ import ldap
 from lib389._constants import *
 from lib389 import Entry
 from lib389._mapped_object import DSLdapObject
+from lib389.dseldif import DSEldif
 from lib389.utils import ensure_bytes, ensure_str
 
 from lib389.lint import DSCLE0001, DSCLE0002, DSELE0001
diff --git a/src/lib389/lib389/dseldif.py b/src/lib389/lib389/dseldif.py
index 69ead6a..1e0de6c 100644
--- a/src/lib389/lib389/dseldif.py
+++ b/src/lib389/lib389/dseldif.py
@@ -17,12 +17,18 @@ class DSEldif(object):
     :type instance: lib389.DirSrv
     """
 
-    def __init__(self, instance):
+    def __init__(self, instance, serverid=None):
         self._instance = instance
         self._contents = []
 
-        ds_paths = Paths(self._instance.serverid, self._instance)
-        self.path = os.path.join(ds_paths.config_dir, 'dse.ldif')
+        if serverid:
+            # Get the dse.ldif from the instance name
+            prefix = os.environ.get('PREFIX', ""),
+            serverid = serverid.replace("slapd-", "")
+            self.path = "{}/etc/dirsrv/slapd-{}/dse.ldif".format(prefix[0], serverid)
+        else:
+            ds_paths = Paths(self._instance.serverid, self._instance)
+            self.path = os.path.join(ds_paths.config_dir, 'dse.ldif')
 
         with open(self.path, 'r') as file_dse:
             for line in file_dse.readlines():
@@ -67,13 +73,15 @@ class DSEldif(object):
 
         return entry_dn_i, attr_data
 
-    def get(self, entry_dn, attr):
+    def get(self, entry_dn, attr, single=False):
         """Return attribute values under a given entry
 
         :param entry_dn: a DN of entry we want to get attribute from
         :type entry_dn: str
         :param attr: an attribute name
         :type attr: str
+        :param single: Return a single value instead of a list
+        :type sigle: boolean
         """
 
         try:
@@ -81,6 +89,12 @@ class DSEldif(object):
         except ValueError:
             return None
 
+        if single:
+            vals = list(attr_data.values())
+            if len(vals) > 0:
+                return vals[0]
+            else:
+                return None
         return attr_data.values()
 
     def add(self, entry_dn, attr, value):
diff --git a/src/lib389/lib389/instance/remove.py b/src/lib389/lib389/instance/remove.py
index 9a376a6..7fa68c0 100644
--- a/src/lib389/lib389/instance/remove.py
+++ b/src/lib389/lib389/instance/remove.py
@@ -26,6 +26,7 @@ def remove_ds_instance(dirsrv):
     remove_paths['cert_dir'] = dirsrv.ds_paths.cert_dir
     remove_paths['config_dir'] = dirsrv.ds_paths.config_dir
     remove_paths['db_dir'] = dirsrv.ds_paths.db_dir
+    remove_paths['db_dir_parent'] = dirsrv.ds_paths.db_dir + "/../"
     ### WARNING: The changelogdb isn't removed. we assume it's in:
     # db_dir ../changelogdb. So remove that too!
     # abspath will resolve the ".." down.
@@ -63,6 +64,8 @@ def remove_ds_instance(dirsrv):
     for path_k in remove_paths:
         _log.debug("Removing %s" % remove_paths[path_k])
         shutil.rmtree(remove_paths[path_k], ignore_errors=True)
+    # Remove parent (/var/lib/dirsrv/slapd-INST)
+    shutil.rmtree(remove_paths['db_dir'].replace('db', ''))
 
     # Finally remove the sysconfig marker.
     os.remove(marker_path)
diff --git a/src/lib389/lib389/schema.py b/src/lib389/lib389/schema.py
index 14817be..bd51a39 100755
--- a/src/lib389/lib389/schema.py
+++ b/src/lib389/lib389/schema.py
@@ -127,7 +127,6 @@ class SchemaLegacy(object):
         ent = ents[0]
         return ent.getValue('nsSchemaCSN')
 
-
     def get_objectclasses(self, json=False):
         """Returns a list of ldap.schema.models.ObjectClass objects for all
         objectClasses supported by this instance.
@@ -171,7 +170,6 @@ class SchemaLegacy(object):
                 results.getValues('attributeTypes')]
             return attributetypes
 
-
     def get_matchingrules(self, json=False):
         """Return a list of the server defined matching rules"""
         attrs = ['matchingrules']
@@ -194,7 +192,6 @@ class SchemaLegacy(object):
                          results.getValues('matchingRules')]
             return matchingRules
 
-
     def query_matchingrule(self, mr_name, json=False):
         """Returns a single matching rule instance that matches the mr_name.
         Returns None if the matching rule doesn't exist.
@@ -307,5 +304,4 @@ class SchemaLegacy(object):
                       'must': must}
             return dump_json(result)
         else:
-           return (attributetype, must, may)
-
+            return (attributetype, must, may)
diff --git a/src/lib389/lib389/utils.py b/src/lib389/lib389/utils.py
index 9bccee8..94fa93d 100644
--- a/src/lib389/lib389/utils.py
+++ b/src/lib389/lib389/utils.py
@@ -40,6 +40,7 @@ from contextlib import closing
 
 import lib389
 from lib389.paths import Paths
+from lib389.dseldif import DSEldif
 from lib389._constants import (
         DEFAULT_USER, VALGRIND_WRAPPER, DN_CONFIG, CFGSUFFIX, LOCALHOST,
         ReplicaRole, CONSUMER_REPLICAID
@@ -1001,3 +1002,38 @@ def format_cmd_list(cmd):
     """Format the subprocess command list to the quoted shell string"""
 
     return " ".join(map(shlex.quote, cmd))
+
+
+def get_ldapurl_from_serverid(instance):
+    """ Take an instance name, and get the host/port/protocol from dse.ldif
+    and return a LDAP URL to use in the CLI tools (dsconf)
+
+    :param instance: The server ID of a server instance
+    :return tuple of LDAPURL and certificate directory (for LDAPS)
+    """
+    try:
+        dse_ldif = DSEldif(None, instance)
+    except:
+        return (None, None)
+
+    port = dse_ldif.get("cn=config", "nsslapd-port", single=True)
+    secureport = dse_ldif.get("cn=config", "nsslapd-secureport", single=True)
+    host = dse_ldif.get("cn=config", "nsslapd-localhost", single=True)
+    sec = dse_ldif.get("cn=config", "nsslapd-security", single=True)
+    ldapi_listen = dse_ldif.get("cn=config", "nsslapd-ldapilisten", single=True)
+    ldapi_autobind = dse_ldif.get("cn=config", "nsslapd-ldapiautobind", single=True)
+    ldapi_socket = dse_ldif.get("cn=config", "nsslapd-ldapifilepath", single=True)
+    certdir = dse_ldif.get("cn=config", "nsslapd-certdir", single=True)
+
+    if ldapi_listen is not None and ldapi_listen.lower() == "on" and \
+       ldapi_autobind is not None and ldapi_autobind.lower() == "on" and \
+       ldapi_socket is not None:
+        # Use LDAPI
+        socket = ldapi_socket.replace("/", "%2f")  # Escape the path
+        return ("ldapi://" + socket, None)
+    elif sec is not None and sec.lower() == "on" and secureport is not None:
+        # Use LDAPS
+        return ("ldaps://{}:{}".format(host, secureport), certdir)
+    else:
+        # Use LDAP
+        return ("ldap://{}:{}".format(host, port), None)