From b446bef3631621593f2700490a6753e2c5decbac Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Fri, 17 Feb 2017 13:03:18 -0500
Subject: [PATCH] Update some more of the iocage API backend. These changes not
 tied to front-facing API calls yet.

---
 src/server/WebBackend.cpp            |  4 --
 src/server/library/sysadm-iocage.cpp | 88 ++++++++--------------------
 2 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index b4ba8ce..f6696b0 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -691,10 +691,6 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIocageRequest(const QJsonVal
 	ok = true;
         out->insert("capjail", sysadm::Iocage::capJail(in_args.toObject()));
       }
-      else if(act=="deactivatepool"){
-	ok = true;
-        out->insert("deactivatepool", sysadm::Iocage::deactivatePool(in_args.toObject()));
-      }
       else if(act=="stopjail"){
 	ok = true;
         out->insert("stopjail", sysadm::Iocage::stopJail(in_args.toObject()));
diff --git a/src/server/library/sysadm-iocage.cpp b/src/server/library/sysadm-iocage.cpp
index 7ff9b7c..e28a983 100644
--- a/src/server/library/sysadm-iocage.cpp
+++ b/src/server/library/sysadm-iocage.cpp
@@ -303,6 +303,32 @@ QJsonObject Iocage::cleanJails() {
   return retObject;
 }
 
+// Stop a jail on the box
+QJsonObject Iocage::stopJail(QJsonObject jsin) {
+  QJsonObject retObject;
+  if(!jsin.contains("jail_uuid")){ return retObject; }
+  // Get the key values
+  QString jail = jsin.value("jail_uuid").toString();
+  bool success = false;
+  QString output = General::RunCommand(success, "iocage stop " + jail);
+  if(success){ retObject.insert("success","jail "+jail+" stopped"); }
+  else{ retObject.insert("error",output); }
+  return retObject;
+}
+
+// Start a jail on the box
+QJsonObject Iocage::startJail(QJsonObject jsin) {
+  QJsonObject retObject;
+  if(!jsin.contains("jail_uuid")){ return retObject; }
+  // Get the key values
+  QString jail = jsin.value("jail_uuid").toString();
+  bool success = false;
+  QString output = General::RunCommand(success, "iocage start " + jail);
+  if(success){ retObject.insert("success","jail "+jail+" started"); }
+  else{ retObject.insert("error",output); }
+  return retObject;
+}
+
 // Execute a process in a jail on the box
 QJsonObject Iocage::execJail(QJsonObject jsin) {
   QJsonObject retObject;
@@ -374,68 +400,6 @@ QJsonObject Iocage::capJail(QJsonObject jsin) {
   return retObject;
 }
 
-// Stop a jail on the box
-QJsonObject Iocage::stopJail(QJsonObject jsin) {
-  QJsonObject retObject;
-
-  QStringList keys = jsin.keys();
-  if (! keys.contains("jail") ) {
-    retObject.insert("error", "Missing required keys");
-    return retObject;
-  }
-
-  // Get the key values
-  QString jail = jsin.value("jail").toString();
-
-  QStringList output = General::RunCommand("iocage stop " + jail).split("\n");
-
-  QJsonObject vals;
-  for ( int i = 0; i < output.size(); i++)
-  {
-    if ( output.at(i).isEmpty() )
-      break;
-
-    QString key = output.at(i).simplified().section(":", 0, 0);
-    QString value = output.at(i).simplified().section(":", 1, 1);
-
-    vals.insert(key, value);
-  }
-
-  retObject.insert(jail, vals);
-  return retObject;
-}
-
-// Start a jail on the box
-QJsonObject Iocage::startJail(QJsonObject jsin) {
-  QJsonObject retObject;
-
-  QStringList keys = jsin.keys();
-  if (! keys.contains("jail") ) {
-    retObject.insert("error", "Missing required keys");
-    return retObject;
-  }
-
-  // Get the key values
-  QString jail = jsin.value("jail").toString();
-
-  QStringList output = General::RunCommand("iocage start " + jail).split("\n");
-
-  QJsonObject vals;
-  for ( int i = 0; i < output.size(); i++)
-  {
-    if ( output.at(i).isEmpty() )
-      break;
-
-    QString key = output.at(i).simplified().section(":", 0, 0);
-    QString value = output.at(i).simplified().section(":", 1, 1);
-
-    vals.insert(key, value);
-  }
-
-  retObject.insert(jail, vals);
-  return retObject;
-}
-
 // Return all the default iocage settings
 /*QJsonObject Iocage::getDefaultSettings() {
   QJsonObject retObject;