From 16038295b1816286e57c1d8238804f74d3bf083f Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Tue, 23 Dec 2014 17:24:00 -0800 Subject: [PATCH] add ControllerSiteDeployment to xoslib --- planetstack/core/xoslib/static/js/xosAdminSite.js | 2 +- .../core/xoslib/static/js/xoslib/xos-backbone.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/planetstack/core/xoslib/static/js/xosAdminSite.js b/planetstack/core/xoslib/static/js/xosAdminSite.js index 833f40d..c4512c8 100644 --- a/planetstack/core/xoslib/static/js/xosAdminSite.js +++ b/planetstack/core/xoslib/static/js/xosAdminSite.js @@ -1,4 +1,4 @@ -OBJS = ['deployment', 'image', 'networkTemplate', 'network', 'networkSliver', 'node', 'service', 'site', 'slice', 'slicePrivilege', 'sliver', 'user', 'sliceRole', 'flavor', 'controller', 'siteDeployment']; +OBJS = ['deployment', 'image', 'networkTemplate', 'network', 'networkSliver', 'node', 'service', 'site', 'slice', 'slicePrivilege', 'sliver', 'user', 'sliceRole', 'flavor', 'controller', 'siteDeployment', 'controllerSiteDeployment']; // 'networkDeployment', 'userDeployment', 'sliceDeployment', 'imageDeployment' NAV_OBJS = ['deployment', 'site', 'slice', 'user']; diff --git a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js index e1c21b0..d59d538 100644 --- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js +++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js @@ -20,6 +20,7 @@ if (! window.XOSLIB_LOADED ) { NETWORKDEPLOYMENT_API = "/plstackapi/networkdeployments/"; FLAVOR_API = "/plstackapi/flavors/"; CONTROLLER_API = "/plstackapi/controllers/"; + CONTROLLERSITEDEPLOYMENT_API = "/plstackapi/controllersitedeploymentses"; /* changed as a side effect of the big rename SLICEDEPLOYMENT_API = "/plstackapi/slice_deployments/"; @@ -571,7 +572,15 @@ if (! window.XOSLIB_LOADED ) { define_model(this, {urlRoot: CONTROLLER_API, modelName: "controller", listFields: ["backend_status", "id", "name", "version", "backend_type"], - detailFields: ["backend_status", "id", "name", "version", "backend_type", "auth_url", "admin_user", "admin_password", "admin_tenant"], + detailFields: ["backend_status", "name", "version", "backend_type", "auth_url", "admin_user", "admin_password", "admin_tenant"], + }); + + define_model(this, {urlRoot: CONTROLLERSITEDEPLOYMENT_API, + modelName: "controllerSiteDeployment", + foreignCollections: ["site_deployments", "controllers"], + foreignFields: {"site_deployment": "siteDeployments", "controller": "controllers"}, + listFields: ["backend_status", "id", "site_deployment", "controller", "tenant_id"], + detailFields: ["backend_status", "site_deployment", "controller", "tenant_id"], }); /* DELETED in site-controller branch -- 2.43.0