From: Scott Baker Date: Tue, 23 Dec 2014 01:56:44 +0000 (-0800) Subject: add SiteDeployment to xoslib X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=c68a3b476e191e88ba481b434b15993dae07dde7 add SiteDeployment to xoslib --- diff --git a/planetstack/core/xoslib/static/js/xosAdminSite.js b/planetstack/core/xoslib/static/js/xosAdminSite.js index 3b46a18..833f40d 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']; +OBJS = ['deployment', 'image', 'networkTemplate', 'network', 'networkSliver', 'node', 'service', 'site', 'slice', 'slicePrivilege', 'sliver', 'user', 'sliceRole', 'flavor', 'controller', 'siteDeployment']; // '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 5837588..e1c21b0 100644 --- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js +++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js @@ -6,6 +6,7 @@ if (! window.XOSLIB_LOADED ) { SLICEROLE_API = "/plstackapi/slice_roles/"; NODE_API = "/plstackapi/nodes/"; SITE_API = "/plstackapi/sites/"; + SITEDEPLOYMENT_API = "/plstackapi/sitedeployments/"; USER_API = "/plstackapi/users/"; USERDEPLOYMENT_API = "/plstackapi/user_deployments/"; DEPLOYMENT_API = "/plstackapi/deployments/"; @@ -490,13 +491,22 @@ if (! window.XOSLIB_LOADED ) { }); define_model(this, {urlRoot: SITE_API, - relatedCollections: {"users": "site", "slices": "site", "nodes": "site"}, + relatedCollections: {"users": "site", "slices": "site", "nodes": "site", "siteDeployments": "site"}, modelName: "site", listFields: ["backend_status", "id", "name", "site_url", "enabled", "login_base", "is_public", "abbreviated_name"], detailFields: ["backend_status", "name", "abbreviated_name", "url", "enabled", "is_public", "login_base"], inputType: {"enabled": "checkbox", "is_public": "checkbox"}, }); + define_model(this, {urlRoot: SITEDEPLOYMENT_API, + foreignCollections: ["sites", "deployments", "controllers"], + foreignFields: {"site": "sites", "deployment": "deployments", "controller": "controllers"}, + modelName: "siteDeployment", + listFields: ["backend_status", "id", "site", "deployment", "controller", "availability_zone"], + detailFields: ["backend_status", "site", "deployment", "controller", "availability_zone"], + inputType: {"enabled": "checkbox", "is_public": "checkbox"}, + }); + define_model(this, {urlRoot: USER_API, relatedCollections: {"slicePrivileges": "user", "slices": "owner"}, foreignCollections: ["sites"],