Service integration > Nodes Repo Checks page

app.js

@@ -6,15 +6,15 @@ var express = require('express'),
 
     //Routes
     index = require('./routes/index'),
-    steps = require('./routes/api/steps'),
-    upgrade7Steps = require('./routes/api/upgrade7/steps'),
-    upgrade7Prechecks = require('./routes/api/upgrade7/prechecks'),
-    upgrade7Backup = require('./routes/api/upgrade7/backup'),
-    upgrade7AdminRepoChecks = require('./routes/api/upgrade7/admin-repo-checks'),
-    upgrade7AdminUpgrade = require('./routes/api/upgrade7/admin-upgrade'),
-    upgrade7NodesRepoChecks = require('./routes/api/upgrade7/nodes-repo-checks'),
-    upgrade7StopOpenStackServices = require('./routes/api/upgrade7/stop-openstack-services'),
-    upgrade7OpenStackServicesBackup = require('./routes/api/upgrade7/openstack-services-backup'),
+    crowbarEntity = require('./routes/api/crowbar/entity'),
+    crowbarBackupCreate = require('./routes/api/crowbar/backups/create'),
+    crowbarBackupDownload =  require('./routes/api/crowbar/backups/download'),
+    crowbarRepocheck = require('./routes/api/crowbar/repocheck'),
+    crowbarUpgrade = require('./routes/api/crowbar/upgrade'),
+    upgradeRepocheck = require('./routes/api/upgrade/repocheck'),
+    upgradePrechecks = require('./routes/api/upgrade/prechecks'),
+    openstackServices = require('./routes/api/openstack/services'),
+    openstackBackup = require('./routes/api/openstack/backup'),
 
     app = express();
 
@@ -27,15 +27,17 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', index);
-app.use('/api/steps', steps);
-app.use('/api/upgrade7/steps', upgrade7Steps);
-app.use('/api/upgrade7/prechecks', upgrade7Prechecks);
-app.use('/api/upgrade7/backup', upgrade7Backup);
-app.use('/api/upgrade7/admin-repo-checks', upgrade7AdminRepoChecks);
-app.use('/api/upgrade7/admin-upgrade', upgrade7AdminUpgrade);
-app.use('/api/upgrade7/nodes-repo-checks', upgrade7NodesRepoChecks);
-app.use('/api/upgrade7/openstack-services/stop', upgrade7StopOpenStackServices);
-app.use('/api/upgrade7/openstack-services/backup', upgrade7OpenStackServicesBackup);
+app.use('/api/crowbar', crowbarEntity);
+app.use('/api/crowbar/backups', crowbarBackupCreate);
+app.use('/api/crowbar/backups/\*/download', crowbarBackupDownload);
+app.use('/api/crowbar/repocheck', crowbarRepocheck);
+app.use('/api/crowbar/upgrade', crowbarUpgrade);
+app.use('/api/upgrade/prechecks', upgradePrechecks);
+app.use('/api/upgrade/repocheck', upgradeRepocheck);
+app.use('/api/openstack/services', openstackServices);
+app.use('/api/openstack/backup', openstackBackup);
+
+
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {

assets/app/crowbar-app.module.js

@@ -12,7 +12,7 @@
     angular
         .module('crowbarApp', [
             'crowbarCore',
-            'crowbarData',
+            'suseData',
             'crowbarWidgets',
 
             /*

assets/app/data/services/upgrade/common-api-v2.constants.js → assets/app/data/crowbar/common-api-v2.constants.js

@@ -1,7 +1,7 @@
 (function() {
 
     angular
-        .module('crowbarData.upgrade')
+        .module('suseData.crowbar')
         .constant('COMMON_API_V2_HEADERS', {
             'Accept': 'application/vnd.crowbar.v2.0+json'
         });

assets/app/data/crowbar/crowbar.module.js

@@ -0,0 +1,5 @@
+(function () {
+    'use strict';
+
+    angular.module('suseData.crowbar', []);
+})();

assets/app/data/services/upgrade/backup.factory.js → assets/app/data/crowbar/services/crowbar-backup.factory.js

@@ -1,19 +1,24 @@
 (function() {
 
     angular
-        .module('crowbarData.upgrade')
-        .factory('upgradeBackupFactory', upgradeBackupFactory);
+        .module('suseData.crowbar')
+        .factory('crowbarBackupFactory', crowbarBackupFactory);
 
-    upgradeBackupFactory.$inject = ['$q', '$http', '$filter', 'COMMON_API_V2_HEADERS'];
+    crowbarBackupFactory.$inject = ['$q', '$http', '$filter', 'COMMON_API_V2_HEADERS'];
     /* @ngInject */
-    function upgradeBackupFactory($q, $http, $filter, COMMON_API_V2_HEADERS) {
+    function crowbarBackupFactory($q, $http, $filter, COMMON_API_V2_HEADERS) {
         var factory = {
             create: createBackup,
-            download: downloadBackup
+            get: getBackup
         };
 
         return factory;
 
+        /**
+         * Create a new backup of the Administration Node
+         * 
+         * @return {Promise}
+         */
         function createBackup() {
 
             var requestOptions = {
@@ -26,10 +31,16 @@
             return $http(requestOptions);
         }
 
-        function downloadBackup(id) {
+        /**
+         * Download a specific backup based on its Id
+         *
+         * @param  {Number} Backup Id to be downloaded
+         * @return {Promise}
+         */
+        function getBackup(id) {
             // this should never happen, caller should make sure 'id' is set
             if (angular.isUndefined(id)) {
-                throw Error('downloadBackup() called without id.');
+                throw Error('getBackup() called without id.');
             }
 
             var requestOptions = {

assets/app/data/services/upgrade/backup.factory.spec.js → assets/app/data/crowbar/services/crowbar-backup.factory.spec.js

@@ -1,5 +1,5 @@
-/*global bard $httpBackend should expect upgradeBackupFactory assert */
-describe('Upgrade Backup Factory', function () {
+/*global bard $httpBackend should expect crowbarBackupFactory assert */
+describe('Crowbar Backup Factory', function () {
 
     var mockedBackupFile = '--mockedBackupFile--',
         mockedCreateResponse = {
@@ -9,8 +9,8 @@ describe('Upgrade Backup Factory', function () {
 
     beforeEach(function () {
         //Setup the module and dependencies to be used.
-        bard.appModule('crowbarData.upgrade');
-        bard.inject('upgradeBackupFactory', '$q', '$httpBackend');
+        bard.appModule('suseData.crowbar');
+        bard.inject('crowbarBackupFactory', '$q', '$httpBackend', 'COMMON_API_V2_HEADERS');
     });
 
     afterEach(function() {
@@ -22,23 +22,23 @@ describe('Upgrade Backup Factory', function () {
     describe('when executed', function () {
 
         it('returns an object', function () {
-            should.exist(upgradeBackupFactory);
+            should.exist(crowbarBackupFactory);
         });
 
         it('returns an object with create function defined', function () {
-            expect(upgradeBackupFactory.create).toEqual(jasmine.any(Function));
+            expect(crowbarBackupFactory.create).toEqual(jasmine.any(Function));
         });
 
-        it('returns an object with download function defined', function () {
-            expect(upgradeBackupFactory.download).toEqual(jasmine.any(Function));
+        it('returns an object with get function defined', function () {
+            expect(crowbarBackupFactory.get).toEqual(jasmine.any(Function));
         });
 
         describe('when create method is executed', function () {
 
             beforeEach(function () {
-                $httpBackend.expect('POST', '/api/crowbar/backups')
+                $httpBackend.expect('POST', '/api/crowbar/backups', undefined)
                     .respond(200, mockedCreateResponse);
-                backupPromise = upgradeBackupFactory.create();
+                backupPromise = crowbarBackupFactory.create();
                 $httpBackend.flush();
             });
 
@@ -65,7 +65,7 @@ describe('Upgrade Backup Factory', function () {
             beforeEach(function () {
                 $httpBackend.expect('GET', '/api/crowbar/backups/42/download')
                     .respond(200, mockedBackupFile);
-                backupPromise = upgradeBackupFactory.download(42);
+                backupPromise = crowbarBackupFactory.get(42);
                 $httpBackend.flush();
             });
 
@@ -92,7 +92,7 @@ describe('Upgrade Backup Factory', function () {
         describe('when download method is executed without parameter', function () {
 
             it('throws an exception', function () {
-                expect(upgradeBackupFactory.download).toThrow();
+                expect(crowbarBackupFactory.get).toThrow();
             });
         });
     });

assets/app/data/crowbar/services/crowbar.factory.js

@@ -0,0 +1,84 @@
+(function() {
+
+    angular
+        .module('suseData.crowbar')
+        .factory('crowbarFactory', crowbarFactory);
+
+    crowbarFactory.$inject = ['$q', '$http', 'COMMON_API_V2_HEADERS'];
+    /* @ngInject */
+    function crowbarFactory($q, $http, COMMON_API_V2_HEADERS) {
+        var factory = {
+            getEntity: getEntity,
+            getRepositoriesChecks: getRepositoriesChecks,
+            upgrade: upgrade,
+            getUpgradeStatus: getUpgradeStatus
+        };
+
+        return factory;
+
+        /**
+         * Get Crowbar Entity
+         * 
+         * @return {Promise}
+         */
+        function getEntity() {
+
+            var requestOptions = {
+                method: 'GET',
+                url: '/api/crowbar',
+                headers: COMMON_API_V2_HEADERS
+            };
+
+            return $http(requestOptions);
+        }
+
+        /**
+         * Get Administration repositories checks (Operative System and Open Stack)
+         * 
+         * @return {Promise}
+         */
+        function getRepositoriesChecks() {
+
+            var requestOptions = {
+                method: 'GET',
+                url: '/api/crowbar/repocheck',
+                headers: COMMON_API_V2_HEADERS
+            };
+
+            return $http(requestOptions);
+
+        }
+
+        /**
+         * Trigger the Upgrade process on the Adinistration Node (Crowbar) from Cloud6 to Cloud7
+         * 
+         * @return {Promise}
+         */
+        function upgrade() {
+
+            var requestOptions = {
+                method: 'POST',
+                url: '/api/crowbar/upgrade',
+                headers: COMMON_API_V2_HEADERS
+            };
+
+            return $http(requestOptions);
+        }
+
+        /**
+         * Get the upgrade status of the Administration Node (Crowbar)
+         * 
+         * @return {Promise}
+         */
+        function getUpgradeStatus() {
+
+            var requestOptions = {
+                method: 'GET',
+                url: '/api/crowbar/upgrade',
+                headers: COMMON_API_V2_HEADERS
+            };
+
+            return $http(requestOptions);
+        }
+    }
+})();