Revision 621a1869 src/scheduler/src/pool/DatastoreXML.cc

View differences:

src/scheduler/src/pool/DatastoreXML.cc
19 19
#include "DatastoreXML.h"
20 20
#include "NebulaUtil.h"
21 21
#include "NebulaLog.h"
22
#include "ObjectCollection.h"
22 23

  
23 24
/* -------------------------------------------------------------------------- */
24 25
/* -------------------------------------------------------------------------- */
......
35 36

  
36 37
void DatastoreXML::init_attributes()
37 38
{
38
    xpath(oid,        "/DATASTORE/ID",          -1);
39
    xpath(cluster_id, "/DATASTORE/CLUSTER_ID",  -1);
39
    xpath(oid,  "/DATASTORE/ID",          -1);
40

  
41
    ObjectCollection cluster_collection("CLUSTERS");
42
    cluster_collection.from_xml(this, "/DATASTORE/");
43

  
44
    cluster_ids = cluster_collection.clone();
40 45

  
41 46
    xpath(uid,      "/DATASTORE/UID",  -1);
42 47
    xpath(gid,      "/DATASTORE/GID",  -1);
......
125 130
    auth.oid = oid;
126 131
    auth.uid = uid;
127 132
    auth.gid = gid;
128
    auth.cid = cluster_id;
133
    auth.cids = cluster_ids;
129 134

  
130 135
    auth.owner_u = owner_u;
131 136
    auth.owner_m = owner_m;

Also available in: Unified diff