add controlleruser to xoslib admin
diff --git a/xos/core/xoslib/static/js/xosAdminSite.js b/xos/core/xoslib/static/js/xosAdminSite.js
index 3dccd81..218c76a 100644
--- a/xos/core/xoslib/static/js/xosAdminSite.js
+++ b/xos/core/xoslib/static/js/xosAdminSite.js
@@ -1,7 +1,7 @@
OBJS = ['deployment', 'image', 'networkTemplate', 'network', 'networkSliver',
'node', 'service', 'site', 'slice', 'slicePrivilege', 'sliver',
'user', 'sliceRole', 'flavor', 'controller', 'siteDeployment',
- 'controller_image', 'controller_network', 'controller_slice'];
+ 'controller_image', 'controller_network', 'controller_slice', 'controller_user'];
NAV_OBJS = ['deployment', 'site', 'slice', 'user'];
REWRITES = {"/admin/core/deployment/": "#deployments",
diff --git a/xos/core/xoslib/static/js/xoslib/xos-backbone.js b/xos/core/xoslib/static/js/xoslib/xos-backbone.js
index c4f1126..0fc1e97 100644
--- a/xos/core/xoslib/static/js/xoslib/xos-backbone.js
+++ b/xos/core/xoslib/static/js/xoslib/xos-backbone.js
@@ -26,6 +26,7 @@
CONTROLLERIMAGE_API = XOS_BASE+"/controllerimages/";
CONTROLLERNETWORK_API = XOS_BASE+"/controllernetworks/";
CONTROLLERSLICE_API = XOS_BASE+"/controllerslices/";
+ CONTROLLERUSER_API = XOS_BASE+"/controllerusers/";
SLICEDEPLOYMENT_API = XOS_BASE+"/slicedeployments/";
USERDEPLOYMENT_API = XOS_BASE+"/userdeployments/";
@@ -546,7 +547,7 @@
});
define_model(this, {urlRoot: USER_API,
- relatedCollections: {"slicePrivileges": "user", "slices": "owner"},
+ relatedCollections: {"slicePrivileges": "user", "slices": "owner", "controller_users": "user"},
foreignCollections: ["sites"],
modelName: "user",
foreignFields: {"site": "sites"},
@@ -638,6 +639,14 @@
detailFields: ["backend_status", "backend_register", "slice", "controller", "tenant_id"],
});
+ define_model(this, {urlRoot: CONTROLLERUSER_API,
+ foreignCollections: ["users", "controllers"],
+ foreignFields: {"user": "users", "controller": "controllers"},
+ modelName: "controller_user",
+ listFields: ["backend_status", "id", "user", "controller", "kuser_id"],
+ detailFields: ["backend_status", "backend_register", "user", "controller", "kuser_id"],
+ });
+
/* removed
define_model(this, {urlRoot: CONTROLLERSITEDEPLOYMENT_API,
modelName: "controllerSiteDeployment",