remove coresitedeployment from xoslib

diff --git a/planetstack/core/xoslib/static/js/xosAdminSite.js b/planetstack/core/xoslib/static/js/xosAdminSite.js
index c4512c8..833f40d 100644 (file)
--- 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', 'controllerSiteDeployment'];
+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'];
 
 // '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 952dfb4..47ea66a 100644 (file)
--- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
+++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
@@ -20,7 +20,10 @@ if (! window.XOSLIB_LOADED ) {
     NETWORKDEPLOYMENT_API = "/plstackapi/networkdeployments/";
     FLAVOR_API = "/plstackapi/flavors/";
     CONTROLLER_API = "/plstackapi/controllers/";
     NETWORKDEPLOYMENT_API = "/plstackapi/networkdeployments/";
     FLAVOR_API = "/plstackapi/flavors/";
     CONTROLLER_API = "/plstackapi/controllers/";

+
+    /* removed

     CONTROLLERSITEDEPLOYMENT_API = "/plstackapi/controllersitedeploymentses";
     CONTROLLERSITEDEPLOYMENT_API = "/plstackapi/controllersitedeploymentses";

+    */

 
     /* changed as a side effect of the big rename
     SLICEDEPLOYMENT_API = "/plstackapi/slice_deployments/";
 
     /* changed as a side effect of the big rename
     SLICEDEPLOYMENT_API = "/plstackapi/slice_deployments/";


@@ -500,7 +503,6 @@ if (! window.XOSLIB_LOADED ) {
                             });
 
         define_model(this, {urlRoot: SITEDEPLOYMENT_API,
                             });
 
         define_model(this, {urlRoot: SITEDEPLOYMENT_API,

-                            relatedCollections: {"controllerSiteDeployments": "site_deployment"},

                             foreignCollections: ["sites", "deployments", "controllers"],
                             foreignFields: {"site": "sites", "deployment": "deployments", "controller": "controllers"},
                             modelName: "siteDeployment",
                             foreignCollections: ["sites", "deployments", "controllers"],
                             foreignFields: {"site": "sites", "deployment": "deployments", "controller": "controllers"},
                             modelName: "siteDeployment",


@@ -576,6 +578,7 @@ if (! window.XOSLIB_LOADED ) {
                             detailFields: ["backend_status", "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"],
                             });
 

+        /* removed

         define_model(this, {urlRoot: CONTROLLERSITEDEPLOYMENT_API,
                             modelName: "controllerSiteDeployment",
                             foreignCollections: ["site_deployments", "controllers"],
         define_model(this, {urlRoot: CONTROLLERSITEDEPLOYMENT_API,
                             modelName: "controllerSiteDeployment",
                             foreignCollections: ["site_deployments", "controllers"],


@@ -583,6 +586,7 @@ if (! window.XOSLIB_LOADED ) {
                             listFields: ["backend_status", "id", "site_deployment", "controller", "tenant_id"],
                             detailFields: ["backend_status", "site_deployment", "controller", "tenant_id"],
                             });
                             listFields: ["backend_status", "id", "site_deployment", "controller", "tenant_id"],
                             detailFields: ["backend_status", "site_deployment", "controller", "tenant_id"],
                             });

+        */

 
         /* DELETED in site-controller branch
 
 
         /* DELETED in site-controller branch