Merge pull request #2200 from CodeNow/SAN-5818-rerun-containers

San 5818 rerun containers

Author: henrymollman

client/directives/components/containerStatusButton/containerStatusButtonController.js

@@ -14,6 +14,7 @@ function ContainerStatusButtonController(
   keypather,
   loading,
   promisify,
+  redeployClusterMasterInstance,
   updateInstanceWithNewAcvData,
   updateInstanceWithNewBuild
 ) {
@@ -56,6 +57,21 @@ function ContainerStatusButtonController(
     restartInstance: function () {
       modInstance('restart');
     },
+    redeployCluster: function () {
+      $rootScope.$broadcast('close-popovers');
+      loading('main', true);
+      var instance = CSBC.instance;
+      var instanceId = keypather.get(instance, 'attrs.id');
+      return redeployClusterMasterInstance(instanceId)
+        .catch(errs.handler)
+        .finally(function () {
+          loading('main', false);
+          return $state.go('base.instances.instance', {
+            instanceName: $state.params.instanceName,
+            userName: $state.params.userName
+          });
+        });
+    },
     rebuildWithoutCache: function () {
       $rootScope.$broadcast('close-popovers');
       loading('main', true);

client/directives/components/containerStatusButton/containerStatusOptionsPopoverView.jade

@@ -19,6 +19,13 @@
         .icons-status.green
         | Restart
 
+      li.popover-list-item(
+        ng-if = "!$root.featureFlags.testMenu && !CSBC.instance.attrs.masterPod && !CSBC.instance.isMigrating() && CSBC.isTesting()"
+        ng-click = "actions.redeployCluster()"
+      )
+        .icons-status.green
+        | Rerun tests
+
       li.popover-list-item(
         ng-if = "$root.featureFlags.internalDebugging"
         ng-click = "CSBC.instance.redeploy(angular.noop)"

client/services/createNewCluster.js

@@ -1,7 +1,8 @@
 'use strict';
 
 require('app')
-  .factory('createNewCluster', createNewCluster);
+  .factory('createNewCluster', createNewCluster)
+  .factory('redeployClusterMasterInstance', redeployClusterMasterInstance);
 
 function createNewCluster(
   $http,
@@ -25,3 +26,19 @@ function createNewCluster(
     });
   };
 }
+
+function redeployClusterMasterInstance(
+  $http,
+  configAPIHost
+) {
+  return function (instanceId) {
+    var data = {
+      instanceId: instanceId
+    };
+    return $http({
+      method: 'POST',
+      url: configAPIHost + '/docker-compose-cluster/redeploy',
+      data: data
+    });
+  };
+}

test/unit/directives/components/containerStatusButton/containerStatusButtonController.unit.js

@@ -7,6 +7,7 @@ var keypather;
 var $q;
 var CSBC;
 var apiMocks = require('./../../../apiMocks/index');
+var redeployClusterMasterInstanceStub;
 
 describe('containerStatusButtonController'.bold.underline.blue, function () {
   var ctx;
@@ -37,6 +38,10 @@ describe('containerStatusButtonController'.bold.underline.blue, function () {
         });
         return promisifyMock;
       });
+      $provide.factory('redeployClusterMasterInstance', function ($q) {
+        redeployClusterMasterInstanceStub = sinon.stub().returns($q.when({}));
+        return redeployClusterMasterInstanceStub
+      });
     });
     angular.mock.inject(function (
       _$controller_,
@@ -159,6 +164,14 @@ describe('containerStatusButtonController'.bold.underline.blue, function () {
         sinon.assert.calledOnce(closePopoversListener);
       });
 
+      it('should allow the user to redeploy a test cluster', function () {
+        keypather.set(CSBC.instance, 'attrs.id', 'runnable.rocks!');
+        var $state
+        CSBC.actions.redeployCluster();
+        sinon.assert.calledWith(redeployClusterMasterInstanceStub, 'runnable.rocks!');
+        sinon.assert.calledOnce(closePopoversListener);
+      })
+
       it('should allow the user to update the configuration to match master', function () {
         var mainAcv = {
           args: {