diff --git a/cli/skx b/cli/skx index 9b9264f..7e93149 100755 --- a/cli/skx +++ b/cli/skx @@ -399,7 +399,6 @@ DISPATCH = { # {object : {verb : ([positional], [options], METHOD, URI, data-f 'delete' : (['backboneid'], [], 'DELETE', '/api/v1alpha1/backbones/${backboneid}', 'Result'), 'list' : ([], [], 'GET', '/api/v1alpha1/backbones', 'Table', 'Backbone Networks', ['id', 'name', ('stat', None, 'lifecycle'), 'failure', ('multitenant', 'YN')]), - 'activate' : (['id'], [], 'PUT', '/api/v1alpha1/backbones/${id}/activate', 'Result'), }, ## diff --git a/components/compose-web-app/modules/backbone.js b/components/compose-web-app/modules/backbone.js index 3a85a7e..d79bc70 100644 --- a/components/compose-web-app/modules/backbone.js +++ b/components/compose-web-app/modules/backbone.js @@ -41,7 +41,7 @@ export async function BuildBackboneTable() { await BackboneDetail(item.id); }); row.insertCell().appendChild(anchor); - row.insertCell().textContent = item.lifecycle.replace('partial', 'not-activated'); + row.insertCell().textContent = item.lifecycle; row.insertCell().textContent = item.failure || ''; } @@ -128,16 +128,6 @@ async function BackboneDetail(bbid) { } fields.push(['Status:', status]); - if (backbone.lifecycle == 'partial') { - let activateButton = document.createElement('button'); - activateButton.textContent = 'Activate'; - activateButton.addEventListener('click', async () => { - let result = await fetch(`/api/v1alpha1/backbones/${bbid}/activate`, { method: 'PUT' }); - await BackboneDetail(bbid); - }); - fields.push(['', activateButton]); - } - let deleteButton = document.createElement('button'); deleteButton.textContent = 'Delete'; deleteButton.addEventListener('click', async () => { @@ -162,11 +152,10 @@ async function BackboneDetail(bbid) { path : `/api/v1alpha1/backbones/${bbid}`, items : { 'lifecycle' : (attr) => { - const newval = attr.replace('partial', 'not-activated'); - if (status.textContent != newval) { - status.textContent = newval; + if (status.textContent != attr) { + status.textContent = attr; } - return newval == 'ready'; + return attr == 'ready'; }, }, }, diff --git a/components/management-controller/src/api-admin.js b/components/management-controller/src/api-admin.js index ee5f463..ff4d09f 100644 --- a/components/management-controller/src/api-admin.js +++ b/components/management-controller/src/api-admin.js @@ -41,7 +41,7 @@ const createBackbone = async function(req, res) { const client = await ClientFromPool(); try { await client.query("BEGIN"); - const result = await client.query("INSERT INTO Backbones(Name, LifeCycle) VALUES ($1, 'partial') RETURNING Id", [norm.name]); + const result = await client.query("INSERT INTO Backbones(Name, LifeCycle) VALUES ($1, 'new') RETURNING Id", [norm.name]); await client.query("COMMIT"); returnStatus = 201; @@ -402,29 +402,6 @@ const updateBackboneLink = async function(req, res) { return returnStatus; } -const activateBackbone = async function(req, res) { - let returnStatus = 200; - const bid = req.params.bid; - const client = await ClientFromPool(); - try { - await client.query("BEGIN"); - if (!IsValidUuid(bid)) { - throw(Error('Backbone-Id is not a valid uuid')); - } - - await client.query("UPDATE Backbones SET Lifecycle = 'new' WHERE Id = $1 and LifeCycle = 'partial'", [bid]); - await client.query("COMMIT"); - res.status(returnStatus).end(); - } catch (error) { - await client.query("ROLLBACK"); - returnStatus = 400; - res.status(returnStatus).send(error.message); - } finally { - client.release(); - } - - return returnStatus; -} const deleteBackbone = async function(req, res) { let returnStatus = 204; @@ -881,9 +858,6 @@ export async function Initialize(app, keycloak) { .get(listBackbones) // READ .delete(deleteBackbone); // DELETE - app.route(API_PREFIX + 'backbones/:bid/activate', keycloak.protect('realm:backbone-admin')) - .put(activateBackbone); // ACTIVATE - //======================================== // Backbone/Interior Sites //========================================