Skip to content

Commit 471232c

Browse files
author
Bamboo Agent
committed
Auto update: Merge pull request #148 in VFS/onepanel-swagger from bugfix/VFS-6437-fix-storage-add-request_v2 to develop
1 parent b43227d commit 471232c

File tree

8 files changed

+88
-216
lines changed

8 files changed

+88
-216
lines changed

‎src/model/Cephrados.js

+11-27
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
* The Ceph storage configuration (uses librados).
4646
* @alias module:model/Cephrados
4747
* @class
48-
* @extends module:model/StorageCreateDetails
49-
* @implements module:model/StorageGetDetails
48+
* @extends module:model/StorageGetDetails
49+
* @implements module:model/StorageCreateDetails
5050
* @implements module:model/CephradosCredentials
5151
* @param type {module:model/Cephrados.TypeEnum} The type of storage.
5252
* @param username {String} The username of the Ceph cluster administrator.
@@ -57,8 +57,8 @@
5757
*/
5858
var exports = function(type, username, key, monitorHostname, clusterName, poolName) {
5959
var _this = this;
60-
StorageCreateDetails.call(_this);
6160
StorageGetDetails.call(_this);
61+
StorageCreateDetails.call(_this);
6262
CephradosCredentials.call(_this, type, username, key);
6363
_this['type'] = type;
6464
_this['monitorHostname'] = monitorHostname;
@@ -88,8 +88,8 @@
8888
exports.constructFromObject = function(data, obj) {
8989
if (data) {
9090
obj = obj || new exports();
91-
StorageCreateDetails.constructFromObject(data, obj);
9291
StorageGetDetails.constructFromObject(data, obj);
92+
StorageCreateDetails.constructFromObject(data, obj);
9393
CephradosCredentials.constructFromObject(data, obj);
9494
if (data.hasOwnProperty('type')) {
9595
obj['type'] = ApiClient.convertToType(data['type'], 'String');
@@ -113,7 +113,7 @@
113113
return obj;
114114
}
115115

116-
exports.prototype = Object.create(StorageCreateDetails.prototype);
116+
exports.prototype = Object.create(StorageGetDetails.prototype);
117117
exports.prototype.constructor = exports;
118118

119119
/**
@@ -148,31 +148,13 @@
148148
*/
149149
exports.prototype['storagePathType'] = 'flat';
150150

151-
// Implement StorageGetDetails interface:
151+
// Implement StorageCreateDetails interface:
152152
/**
153153
* The type of storage.
154154
* @member {String} type
155155
*/
156156
exports.prototype['type'] = undefined;
157157

158-
/**
159-
* The Id of storage.
160-
* @member {String} id
161-
*/
162-
exports.prototype['id'] = undefined;
163-
164-
/**
165-
* The name of storage.
166-
* @member {String} name
167-
*/
168-
exports.prototype['name'] = undefined;
169-
170-
/**
171-
* Result of storage verification (reading and writing a file). Returned only on PATCH requests for read-write storages.
172-
* @member {Boolean} verificationPassed
173-
*/
174-
exports.prototype['verificationPassed'] = undefined;
175-
176158
/**
177159
* Storage operation timeout in milliseconds.
178160
* @member {Number} timeout
@@ -182,14 +164,16 @@ exports.prototype['timeout'] = undefined;
182164
/**
183165
* If true, detecting whether storage is directly accessible by the Oneclient will not be performed. This option should be set to true on readonly storages.
184166
* @member {Boolean} skipStorageDetection
167+
* @default false
185168
*/
186-
exports.prototype['skipStorageDetection'] = undefined;
169+
exports.prototype['skipStorageDetection'] = false;
187170

188171
/**
189172
* Type of feed for LUMA DB. Feed is a source of user/group mappings used to populate the LUMA DB. For more info please read: https://onedata.org/#/home/documentation/doc/administering_onedata/luma.html
190-
* @member {module:model/StorageGetDetails.LumaFeedEnum} lumaFeed
173+
* @member {module:model/StorageCreateDetails.LumaFeedEnum} lumaFeed
174+
* @default 'auto'
191175
*/
192-
exports.prototype['lumaFeed'] = undefined;
176+
exports.prototype['lumaFeed'] = 'auto';
193177

194178
/**
195179
* URL of external feed for LUMA DB. Relevant only if lumaFeed equals `external`.

‎src/model/Glusterfs.js

+11-27
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
* The GlusterFS storage configuration.
4646
* @alias module:model/Glusterfs
4747
* @class
48-
* @extends module:model/StorageCreateDetails
49-
* @implements module:model/StorageGetDetails
48+
* @extends module:model/StorageGetDetails
49+
* @implements module:model/StorageCreateDetails
5050
* @param type {module:model/Glusterfs.TypeEnum} The type of storage.
5151
* @param volume {String} The name of the volume to use as a storage backend.
5252
* @param hostname {String} The hostname (IP address or FQDN) of GlusterFS volume server.
5353
*/
5454
var exports = function(type, volume, hostname) {
5555
var _this = this;
56-
StorageCreateDetails.call(_this);
5756
StorageGetDetails.call(_this);
57+
StorageCreateDetails.call(_this);
5858
_this['type'] = type;
5959
_this['volume'] = volume;
6060
_this['hostname'] = hostname;
@@ -85,8 +85,8 @@
8585
exports.constructFromObject = function(data, obj) {
8686
if (data) {
8787
obj = obj || new exports();
88-
StorageCreateDetails.constructFromObject(data, obj);
8988
StorageGetDetails.constructFromObject(data, obj);
89+
StorageCreateDetails.constructFromObject(data, obj);
9090
if (data.hasOwnProperty('type')) {
9191
obj['type'] = ApiClient.convertToType(data['type'], 'String');
9292
}
@@ -115,7 +115,7 @@
115115
return obj;
116116
}
117117

118-
exports.prototype = Object.create(StorageCreateDetails.prototype);
118+
exports.prototype = Object.create(StorageGetDetails.prototype);
119119
exports.prototype.constructor = exports;
120120

121121
/**
@@ -163,31 +163,13 @@
163163
*/
164164
exports.prototype['storagePathType'] = 'canonical';
165165

166-
// Implement StorageGetDetails interface:
166+
// Implement StorageCreateDetails interface:
167167
/**
168168
* The type of storage.
169169
* @member {String} type
170170
*/
171171
exports.prototype['type'] = undefined;
172172

173-
/**
174-
* The Id of storage.
175-
* @member {String} id
176-
*/
177-
exports.prototype['id'] = undefined;
178-
179-
/**
180-
* The name of storage.
181-
* @member {String} name
182-
*/
183-
exports.prototype['name'] = undefined;
184-
185-
/**
186-
* Result of storage verification (reading and writing a file). Returned only on PATCH requests for read-write storages.
187-
* @member {Boolean} verificationPassed
188-
*/
189-
exports.prototype['verificationPassed'] = undefined;
190-
191173
/**
192174
* Storage operation timeout in milliseconds.
193175
* @member {Number} timeout
@@ -197,14 +179,16 @@ exports.prototype['timeout'] = undefined;
197179
/**
198180
* If true, detecting whether storage is directly accessible by the Oneclient will not be performed. This option should be set to true on readonly storages.
199181
* @member {Boolean} skipStorageDetection
182+
* @default false
200183
*/
201-
exports.prototype['skipStorageDetection'] = undefined;
184+
exports.prototype['skipStorageDetection'] = false;
202185

203186
/**
204187
* Type of feed for LUMA DB. Feed is a source of user/group mappings used to populate the LUMA DB. For more info please read: https://onedata.org/#/home/documentation/doc/administering_onedata/luma.html
205-
* @member {module:model/StorageGetDetails.LumaFeedEnum} lumaFeed
188+
* @member {module:model/StorageCreateDetails.LumaFeedEnum} lumaFeed
189+
* @default 'auto'
206190
*/
207-
exports.prototype['lumaFeed'] = undefined;
191+
exports.prototype['lumaFeed'] = 'auto';
208192

209193
/**
210194
* URL of external feed for LUMA DB. Relevant only if lumaFeed equals `external`.

‎src/model/Localceph.js

+11-27
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
* Configuration of a Ceph (librados) storage backed by a Ceph pool created in the local Ceph cluster.
4646
* @alias module:model/Localceph
4747
* @class
48-
* @extends module:model/StorageCreateDetails
49-
* @implements module:model/StorageGetDetails
48+
* @extends module:model/StorageGetDetails
49+
* @implements module:model/StorageCreateDetails
5050
* @implements module:model/CephPool
5151
*/
5252
var exports = function() {
5353
var _this = this;
54-
StorageCreateDetails.call(_this);
5554
StorageGetDetails.call(_this);
55+
StorageCreateDetails.call(_this);
5656
CephPool.call(_this);
5757

5858

@@ -79,8 +79,8 @@
7979
exports.constructFromObject = function(data, obj) {
8080
if (data) {
8181
obj = obj || new exports();
82-
StorageCreateDetails.constructFromObject(data, obj);
8382
StorageGetDetails.constructFromObject(data, obj);
83+
StorageCreateDetails.constructFromObject(data, obj);
8484
CephPool.constructFromObject(data, obj);
8585
if (data.hasOwnProperty('type')) {
8686
obj['type'] = ApiClient.convertToType(data['type'], 'String');
@@ -95,7 +95,7 @@
9595
return obj;
9696
}
9797

98-
exports.prototype = Object.create(StorageCreateDetails.prototype);
98+
exports.prototype = Object.create(StorageGetDetails.prototype);
9999
exports.prototype.constructor = exports;
100100

101101
/**
@@ -115,31 +115,13 @@
115115
*/
116116
exports.prototype['storagePathType'] = 'flat';
117117

118-
// Implement StorageGetDetails interface:
118+
// Implement StorageCreateDetails interface:
119119
/**
120120
* The type of storage.
121121
* @member {String} type
122122
*/
123123
exports.prototype['type'] = undefined;
124124

125-
/**
126-
* The Id of storage.
127-
* @member {String} id
128-
*/
129-
exports.prototype['id'] = undefined;
130-
131-
/**
132-
* The name of storage.
133-
* @member {String} name
134-
*/
135-
exports.prototype['name'] = undefined;
136-
137-
/**
138-
* Result of storage verification (reading and writing a file). Returned only on PATCH requests for read-write storages.
139-
* @member {Boolean} verificationPassed
140-
*/
141-
exports.prototype['verificationPassed'] = undefined;
142-
143125
/**
144126
* Storage operation timeout in milliseconds.
145127
* @member {Number} timeout
@@ -149,14 +131,16 @@ exports.prototype['timeout'] = undefined;
149131
/**
150132
* If true, detecting whether storage is directly accessible by the Oneclient will not be performed. This option should be set to true on readonly storages.
151133
* @member {Boolean} skipStorageDetection
134+
* @default false
152135
*/
153-
exports.prototype['skipStorageDetection'] = undefined;
136+
exports.prototype['skipStorageDetection'] = false;
154137

155138
/**
156139
* Type of feed for LUMA DB. Feed is a source of user/group mappings used to populate the LUMA DB. For more info please read: https://onedata.org/#/home/documentation/doc/administering_onedata/luma.html
157-
* @member {module:model/StorageGetDetails.LumaFeedEnum} lumaFeed
140+
* @member {module:model/StorageCreateDetails.LumaFeedEnum} lumaFeed
141+
* @default 'auto'
158142
*/
159-
exports.prototype['lumaFeed'] = undefined;
143+
exports.prototype['lumaFeed'] = 'auto';
160144

161145
/**
162146
* URL of external feed for LUMA DB. Relevant only if lumaFeed equals `external`.

‎src/model/Nulldevice.js

+11-27
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
* The Null Device storage configuration.
4646
* @alias module:model/Nulldevice
4747
* @class
48-
* @extends module:model/StorageCreateDetails
49-
* @implements module:model/StorageGetDetails
48+
* @extends module:model/StorageGetDetails
49+
* @implements module:model/StorageCreateDetails
5050
* @param type {module:model/Nulldevice.TypeEnum} The type of storage.
5151
*/
5252
var exports = function(type) {
5353
var _this = this;
54-
StorageCreateDetails.call(_this);
5554
StorageGetDetails.call(_this);
55+
StorageCreateDetails.call(_this);
5656
_this['type'] = type;
5757

5858

@@ -83,8 +83,8 @@
8383
exports.constructFromObject = function(data, obj) {
8484
if (data) {
8585
obj = obj || new exports();
86-
StorageCreateDetails.constructFromObject(data, obj);
8786
StorageGetDetails.constructFromObject(data, obj);
87+
StorageCreateDetails.constructFromObject(data, obj);
8888
if (data.hasOwnProperty('type')) {
8989
obj['type'] = ApiClient.convertToType(data['type'], 'String');
9090
}
@@ -113,7 +113,7 @@
113113
return obj;
114114
}
115115

116-
exports.prototype = Object.create(StorageCreateDetails.prototype);
116+
exports.prototype = Object.create(StorageGetDetails.prototype);
117117
exports.prototype.constructor = exports;
118118

119119
/**
@@ -162,31 +162,13 @@
162162
*/
163163
exports.prototype['simulatedFilesystemGrowSpeed'] = 0.0;
164164

165-
// Implement StorageGetDetails interface:
165+
// Implement StorageCreateDetails interface:
166166
/**
167167
* The type of storage.
168168
* @member {String} type
169169
*/
170170
exports.prototype['type'] = undefined;
171171

172-
/**
173-
* The Id of storage.
174-
* @member {String} id
175-
*/
176-
exports.prototype['id'] = undefined;
177-
178-
/**
179-
* The name of storage.
180-
* @member {String} name
181-
*/
182-
exports.prototype['name'] = undefined;
183-
184-
/**
185-
* Result of storage verification (reading and writing a file). Returned only on PATCH requests for read-write storages.
186-
* @member {Boolean} verificationPassed
187-
*/
188-
exports.prototype['verificationPassed'] = undefined;
189-
190172
/**
191173
* Storage operation timeout in milliseconds.
192174
* @member {Number} timeout
@@ -196,14 +178,16 @@ exports.prototype['timeout'] = undefined;
196178
/**
197179
* If true, detecting whether storage is directly accessible by the Oneclient will not be performed. This option should be set to true on readonly storages.
198180
* @member {Boolean} skipStorageDetection
181+
* @default false
199182
*/
200-
exports.prototype['skipStorageDetection'] = undefined;
183+
exports.prototype['skipStorageDetection'] = false;
201184

202185
/**
203186
* Type of feed for LUMA DB. Feed is a source of user/group mappings used to populate the LUMA DB. For more info please read: https://onedata.org/#/home/documentation/doc/administering_onedata/luma.html
204-
* @member {module:model/StorageGetDetails.LumaFeedEnum} lumaFeed
187+
* @member {module:model/StorageCreateDetails.LumaFeedEnum} lumaFeed
188+
* @default 'auto'
205189
*/
206-
exports.prototype['lumaFeed'] = undefined;
190+
exports.prototype['lumaFeed'] = 'auto';
207191

208192
/**
209193
* URL of external feed for LUMA DB. Relevant only if lumaFeed equals `external`.

0 commit comments

Comments
 (0)