python-manilaclient 5.0.0__py3-none-any.whl → 5.2.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- manilaclient/api_versions.py +1 -1
- manilaclient/common/httpclient.py +1 -4
- manilaclient/osc/v2/services.py +32 -0
- manilaclient/osc/v2/share.py +122 -1
- manilaclient/tests/unit/osc/v2/fakes.py +1 -0
- manilaclient/tests/unit/osc/v2/test_services.py +58 -0
- manilaclient/tests/unit/osc/v2/test_share.py +143 -2
- manilaclient/tests/unit/osc/v2/test_share_groups.py +3 -7
- manilaclient/tests/unit/v2/test_services.py +10 -0
- manilaclient/v2/services.py +6 -0
- manilaclient/v2/share_export_locations.py +23 -1
- {python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/AUTHORS +2 -0
- {python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/METADATA +3 -3
- {python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/RECORD +19 -19
- {python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/entry_points.txt +3 -0
- python_manilaclient-5.2.0.dist-info/pbr.json +1 -0
- python_manilaclient-5.0.0.dist-info/pbr.json +0 -1
- {python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/LICENSE +0 -0
- {python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/WHEEL +0 -0
- {python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/top_level.txt +0 -0
manilaclient/api_versions.py
CHANGED
|
@@ -28,10 +28,7 @@ import requests
|
|
|
28
28
|
|
|
29
29
|
from manilaclient import exceptions
|
|
30
30
|
|
|
31
|
-
|
|
32
|
-
from eventlet import sleep
|
|
33
|
-
except ImportError:
|
|
34
|
-
from time import sleep # noqa
|
|
31
|
+
from time import sleep # noqa
|
|
35
32
|
|
|
36
33
|
try:
|
|
37
34
|
osprofiler_web = importutils.try_import("osprofiler.web")
|
manilaclient/osc/v2/services.py
CHANGED
|
@@ -151,8 +151,40 @@ class ListShareService(command.Lister):
|
|
|
151
151
|
]
|
|
152
152
|
if share_client.api_version >= api_versions.APIVersion("2.83"):
|
|
153
153
|
columns.append('Disabled Reason')
|
|
154
|
+
if share_client.api_version >= api_versions.APIVersion("2.86"):
|
|
155
|
+
columns.append('Ensuring')
|
|
154
156
|
|
|
155
157
|
data = (osc_utils.get_dict_properties(
|
|
156
158
|
service._info, columns) for service in services)
|
|
157
159
|
|
|
158
160
|
return (columns, data)
|
|
161
|
+
|
|
162
|
+
|
|
163
|
+
class EnsureShareService(command.Command):
|
|
164
|
+
"""Run ensure shares in a back end (Admin only)."""
|
|
165
|
+
_description = _("Run ensure shares in a back end (Admin only).")
|
|
166
|
+
|
|
167
|
+
def get_parser(self, prog_name):
|
|
168
|
+
parser = super(EnsureShareService, self).get_parser(prog_name)
|
|
169
|
+
parser.add_argument(
|
|
170
|
+
'host',
|
|
171
|
+
metavar='<host>',
|
|
172
|
+
help=_("Host to run ensure shares. "
|
|
173
|
+
"'example_host@example_backend'.")
|
|
174
|
+
)
|
|
175
|
+
return parser
|
|
176
|
+
|
|
177
|
+
def take_action(self, parsed_args):
|
|
178
|
+
share_client = self.app.client_manager.share
|
|
179
|
+
|
|
180
|
+
if share_client.api_version < api_versions.APIVersion("2.86"):
|
|
181
|
+
raise exceptions.CommandError(
|
|
182
|
+
"Ensure shares API is only available in "
|
|
183
|
+
"manila API version >= 2.86")
|
|
184
|
+
|
|
185
|
+
try:
|
|
186
|
+
share_client.services.ensure_shares(parsed_args.host)
|
|
187
|
+
except Exception as e:
|
|
188
|
+
raise exceptions.CommandError(
|
|
189
|
+
_("Failed to run ensure shares: %s" % e)
|
|
190
|
+
)
|
manilaclient/osc/v2/share.py
CHANGED
|
@@ -1179,8 +1179,15 @@ class ShareExportLocationShow(command.ShowOne):
|
|
|
1179
1179
|
share=share,
|
|
1180
1180
|
export_location=parsed_args.export_location
|
|
1181
1181
|
)
|
|
1182
|
+
data = export_location._info
|
|
1183
|
+
data.update(
|
|
1184
|
+
{
|
|
1185
|
+
'properties':
|
|
1186
|
+
format_columns.DictColumn(data.pop('metadata', {})),
|
|
1187
|
+
},
|
|
1188
|
+
)
|
|
1182
1189
|
|
|
1183
|
-
return self.dict2columns(
|
|
1190
|
+
return self.dict2columns(data)
|
|
1184
1191
|
|
|
1185
1192
|
|
|
1186
1193
|
class ShareExportLocationList(command.Lister):
|
|
@@ -1218,6 +1225,120 @@ class ShareExportLocationList(command.Lister):
|
|
|
1218
1225
|
(s, list_of_keys) for s in export_locations))
|
|
1219
1226
|
|
|
1220
1227
|
|
|
1228
|
+
class ShareExportLocationSet(command.Command):
|
|
1229
|
+
"""Set an export location property."""
|
|
1230
|
+
|
|
1231
|
+
_description = _("Set an export location property.")
|
|
1232
|
+
|
|
1233
|
+
def get_parser(self, prog_name):
|
|
1234
|
+
parser = super(ShareExportLocationSet, self).get_parser(
|
|
1235
|
+
prog_name)
|
|
1236
|
+
|
|
1237
|
+
parser.add_argument(
|
|
1238
|
+
'share',
|
|
1239
|
+
metavar="<share>",
|
|
1240
|
+
help=_('Name or ID of share')
|
|
1241
|
+
)
|
|
1242
|
+
parser.add_argument(
|
|
1243
|
+
'export_location',
|
|
1244
|
+
metavar="<export_location>",
|
|
1245
|
+
help=_('ID of the export location')
|
|
1246
|
+
)
|
|
1247
|
+
parser.add_argument(
|
|
1248
|
+
"--property",
|
|
1249
|
+
metavar="<key=value>",
|
|
1250
|
+
default={},
|
|
1251
|
+
action=parseractions.KeyValueAction,
|
|
1252
|
+
help=_("Set a property to this export location "
|
|
1253
|
+
"(repeat option to set multiple properties). "
|
|
1254
|
+
"Available only for microversion >= 2.87."),
|
|
1255
|
+
)
|
|
1256
|
+
return parser
|
|
1257
|
+
|
|
1258
|
+
def take_action(self, parsed_args):
|
|
1259
|
+
share_client = self.app.client_manager.share
|
|
1260
|
+
share_id = apiutils.find_resource(
|
|
1261
|
+
share_client.shares,
|
|
1262
|
+
parsed_args.share).id
|
|
1263
|
+
|
|
1264
|
+
if (parsed_args.property and
|
|
1265
|
+
share_client.api_version < api_versions.APIVersion("2.87")):
|
|
1266
|
+
raise exceptions.CommandError(
|
|
1267
|
+
"Property can be specified only with manila API "
|
|
1268
|
+
"version >= 2.87.")
|
|
1269
|
+
|
|
1270
|
+
if parsed_args.property:
|
|
1271
|
+
try:
|
|
1272
|
+
share_client.share_export_locations.set_metadata(
|
|
1273
|
+
share_id,
|
|
1274
|
+
parsed_args.property,
|
|
1275
|
+
subresource=parsed_args.export_location)
|
|
1276
|
+
except Exception as e:
|
|
1277
|
+
raise exceptions.CommandError(_(
|
|
1278
|
+
"Failed to set export location property "
|
|
1279
|
+
"'%(properties)s': %(e)s") %
|
|
1280
|
+
{'properties': parsed_args.property, 'e': e}
|
|
1281
|
+
)
|
|
1282
|
+
|
|
1283
|
+
|
|
1284
|
+
class ShareExportLocationUnset(command.Command):
|
|
1285
|
+
"""Unset a share export location property"""
|
|
1286
|
+
_description = _("Unset a share export location property")
|
|
1287
|
+
|
|
1288
|
+
def get_parser(self, prog_name):
|
|
1289
|
+
parser = super(ShareExportLocationUnset, self).get_parser(
|
|
1290
|
+
prog_name)
|
|
1291
|
+
|
|
1292
|
+
parser.add_argument(
|
|
1293
|
+
'share',
|
|
1294
|
+
metavar="<share>",
|
|
1295
|
+
help=_('Name or ID of share')
|
|
1296
|
+
)
|
|
1297
|
+
parser.add_argument(
|
|
1298
|
+
'export_location',
|
|
1299
|
+
metavar="<export_location>",
|
|
1300
|
+
help=_('ID of the export location')
|
|
1301
|
+
)
|
|
1302
|
+
parser.add_argument(
|
|
1303
|
+
"--property",
|
|
1304
|
+
metavar="<key>",
|
|
1305
|
+
action='append',
|
|
1306
|
+
help=_("Remove a property from export location "
|
|
1307
|
+
"(repeat option to remove multiple properties). "
|
|
1308
|
+
"Available only for microversion >= 2.87."),
|
|
1309
|
+
)
|
|
1310
|
+
return parser
|
|
1311
|
+
|
|
1312
|
+
def take_action(self, parsed_args):
|
|
1313
|
+
share_client = self.app.client_manager.share
|
|
1314
|
+
share_id = apiutils.find_resource(
|
|
1315
|
+
share_client.shares,
|
|
1316
|
+
parsed_args.share).id
|
|
1317
|
+
|
|
1318
|
+
if (parsed_args.property and
|
|
1319
|
+
share_client.api_version < api_versions.APIVersion("2.87")):
|
|
1320
|
+
raise exceptions.CommandError(
|
|
1321
|
+
"Property can be specified only with manila API "
|
|
1322
|
+
"version >= 2.87.")
|
|
1323
|
+
|
|
1324
|
+
if parsed_args.property:
|
|
1325
|
+
result = 0
|
|
1326
|
+
for key in parsed_args.property:
|
|
1327
|
+
try:
|
|
1328
|
+
share_client.share_export_locations.delete_metadata(
|
|
1329
|
+
share_id, [key],
|
|
1330
|
+
subresource=parsed_args.export_location)
|
|
1331
|
+
except Exception as e:
|
|
1332
|
+
result += 1
|
|
1333
|
+
LOG.error("Failed to unset export location property "
|
|
1334
|
+
"'%(key)s': %(e)s", {'key': key, 'e': e})
|
|
1335
|
+
if result > 0:
|
|
1336
|
+
total = len(parsed_args.property)
|
|
1337
|
+
raise exceptions.CommandError(
|
|
1338
|
+
f"{result} of {total} export location properties failed "
|
|
1339
|
+
f"to be unset.")
|
|
1340
|
+
|
|
1341
|
+
|
|
1221
1342
|
class ShowShareProperties(command.ShowOne):
|
|
1222
1343
|
"""Show properties of a share"""
|
|
1223
1344
|
_description = _("Show share properties")
|
|
@@ -266,3 +266,61 @@ class TestShareServiceList(TestShareService):
|
|
|
266
266
|
else:
|
|
267
267
|
self.assertEqual(self.column_headers, columns)
|
|
268
268
|
self.assertEqual(list(self.values), list(data))
|
|
269
|
+
|
|
270
|
+
|
|
271
|
+
@ddt.ddt
|
|
272
|
+
class TestShareServiceEnsureShares(TestShareService):
|
|
273
|
+
|
|
274
|
+
def setUp(self):
|
|
275
|
+
super(TestShareServiceEnsureShares, self).setUp()
|
|
276
|
+
|
|
277
|
+
self.cmd = osc_services.EnsureShareService(self.app, None)
|
|
278
|
+
|
|
279
|
+
def test_ensure_shares(self):
|
|
280
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
281
|
+
'2.86')
|
|
282
|
+
fake_host = 'fake_host@fakebackend'
|
|
283
|
+
arglist = [
|
|
284
|
+
fake_host,
|
|
285
|
+
]
|
|
286
|
+
verifylist = [
|
|
287
|
+
('host', fake_host),
|
|
288
|
+
]
|
|
289
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
290
|
+
|
|
291
|
+
self.cmd.take_action(parsed_args)
|
|
292
|
+
|
|
293
|
+
self.services_mock.ensure_shares.assert_called_with(fake_host)
|
|
294
|
+
|
|
295
|
+
def test_ensure_shares_invalid_version(self):
|
|
296
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
297
|
+
'2.85')
|
|
298
|
+
fake_host = 'fake_host@fakebackend'
|
|
299
|
+
arglist = [
|
|
300
|
+
fake_host,
|
|
301
|
+
]
|
|
302
|
+
verifylist = [
|
|
303
|
+
('host', fake_host),
|
|
304
|
+
]
|
|
305
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
306
|
+
|
|
307
|
+
self.assertRaises(exceptions.CommandError,
|
|
308
|
+
self.cmd.take_action,
|
|
309
|
+
parsed_args)
|
|
310
|
+
|
|
311
|
+
def test_ensure_shares_command_error(self):
|
|
312
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
313
|
+
'2.86')
|
|
314
|
+
self.services_mock.ensure_shares.side_effect = Exception()
|
|
315
|
+
fake_host = 'fake_host@fakebackend'
|
|
316
|
+
arglist = [
|
|
317
|
+
fake_host,
|
|
318
|
+
]
|
|
319
|
+
verifylist = [
|
|
320
|
+
('host', fake_host),
|
|
321
|
+
]
|
|
322
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
323
|
+
|
|
324
|
+
self.assertRaises(exceptions.CommandError,
|
|
325
|
+
self.cmd.take_action,
|
|
326
|
+
parsed_args)
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
# under the License.
|
|
14
14
|
#
|
|
15
15
|
|
|
16
|
-
import argparse
|
|
17
16
|
import ddt
|
|
18
17
|
from unittest import mock
|
|
19
18
|
import uuid
|
|
@@ -1052,7 +1051,7 @@ class TestShareList(TestShare):
|
|
|
1052
1051
|
verifylist = [
|
|
1053
1052
|
("limit", -2),
|
|
1054
1053
|
]
|
|
1055
|
-
self.assertRaises(
|
|
1054
|
+
self.assertRaises(osc_utils.ParserException, self.check_parser,
|
|
1056
1055
|
self.cmd, arglist, verifylist)
|
|
1057
1056
|
|
|
1058
1057
|
def test_share_list_name_description_filter(self):
|
|
@@ -1910,6 +1909,148 @@ class TestShareExportLocationList(TestShare):
|
|
|
1910
1909
|
self.assertCountEqual(self.values, data)
|
|
1911
1910
|
|
|
1912
1911
|
|
|
1912
|
+
class TestExportLocationSet(TestShare):
|
|
1913
|
+
|
|
1914
|
+
def setUp(self):
|
|
1915
|
+
super(TestExportLocationSet, self).setUp()
|
|
1916
|
+
|
|
1917
|
+
self._share = manila_fakes.FakeShare.create_one_share(
|
|
1918
|
+
methods={"set_metadata": None}
|
|
1919
|
+
)
|
|
1920
|
+
self.shares_mock.get.return_value = self._share
|
|
1921
|
+
|
|
1922
|
+
self._export_location = (
|
|
1923
|
+
manila_fakes.FakeShareExportLocation.create_one_export_location(
|
|
1924
|
+
{'fake_share_instance_id': self._share.id}))
|
|
1925
|
+
|
|
1926
|
+
self.export_locations_mock.get.return_value = (
|
|
1927
|
+
self._export_location
|
|
1928
|
+
)
|
|
1929
|
+
|
|
1930
|
+
self.cmd = osc_shares.ShareExportLocationSet(self.app, None)
|
|
1931
|
+
|
|
1932
|
+
def test_share_set_export_location_property(self):
|
|
1933
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
1934
|
+
'2.87'
|
|
1935
|
+
)
|
|
1936
|
+
arglist = [
|
|
1937
|
+
self._share.id,
|
|
1938
|
+
self._export_location.id,
|
|
1939
|
+
'--property', 'Bobcat=manila',
|
|
1940
|
+
|
|
1941
|
+
]
|
|
1942
|
+
verifylist = [
|
|
1943
|
+
('share', self._share.id),
|
|
1944
|
+
('export_location', self._export_location.id),
|
|
1945
|
+
('property', {'Bobcat': 'manila'}),
|
|
1946
|
+
]
|
|
1947
|
+
|
|
1948
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
1949
|
+
self.cmd.take_action(parsed_args)
|
|
1950
|
+
self.export_locations_mock.set_metadata.assert_called_once_with(
|
|
1951
|
+
self._share.id, {'Bobcat': 'manila'},
|
|
1952
|
+
subresource=self._export_location.id)
|
|
1953
|
+
|
|
1954
|
+
def test_share_set_export_location_property_exception(self):
|
|
1955
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
1956
|
+
'2.87'
|
|
1957
|
+
)
|
|
1958
|
+
arglist = [
|
|
1959
|
+
self._share.id,
|
|
1960
|
+
self._export_location.id,
|
|
1961
|
+
'--property', 'key=',
|
|
1962
|
+
]
|
|
1963
|
+
verifylist = [
|
|
1964
|
+
('share', self._share.id),
|
|
1965
|
+
('export_location', self._export_location.id),
|
|
1966
|
+
('property', {'key': ''}),
|
|
1967
|
+
]
|
|
1968
|
+
|
|
1969
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
1970
|
+
self.cmd.take_action(parsed_args)
|
|
1971
|
+
|
|
1972
|
+
self.export_locations_mock.set_metadata.assert_called_once_with(
|
|
1973
|
+
self._share.id, {'key': ''},
|
|
1974
|
+
subresource=self._export_location.id)
|
|
1975
|
+
|
|
1976
|
+
self.export_locations_mock.set_metadata.side_effect = (
|
|
1977
|
+
exceptions.BadRequest)
|
|
1978
|
+
self.assertRaises(
|
|
1979
|
+
osc_exceptions.CommandError, self.cmd.take_action,
|
|
1980
|
+
parsed_args)
|
|
1981
|
+
|
|
1982
|
+
|
|
1983
|
+
class TestExportLocationUnset(TestShare):
|
|
1984
|
+
|
|
1985
|
+
def setUp(self):
|
|
1986
|
+
super(TestExportLocationUnset, self).setUp()
|
|
1987
|
+
|
|
1988
|
+
self._share = manila_fakes.FakeShare.create_one_share(
|
|
1989
|
+
methods={"set_metadata": None}
|
|
1990
|
+
)
|
|
1991
|
+
self.shares_mock.get.return_value = self._share
|
|
1992
|
+
|
|
1993
|
+
self._export_location = (
|
|
1994
|
+
manila_fakes.FakeShareExportLocation.create_one_export_location(
|
|
1995
|
+
{'fake_share_instance_id': self._share.id}))
|
|
1996
|
+
|
|
1997
|
+
self.export_locations_mock.get.return_value = (
|
|
1998
|
+
self._export_location
|
|
1999
|
+
)
|
|
2000
|
+
|
|
2001
|
+
self.cmd = osc_shares.ShareExportLocationUnset(self.app, None)
|
|
2002
|
+
|
|
2003
|
+
def test_share_unset_export_location_property(self):
|
|
2004
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
2005
|
+
'2.87'
|
|
2006
|
+
)
|
|
2007
|
+
arglist = [
|
|
2008
|
+
self._share.id,
|
|
2009
|
+
self._export_location.id,
|
|
2010
|
+
'--property', 'Bobcat',
|
|
2011
|
+
|
|
2012
|
+
]
|
|
2013
|
+
verifylist = [
|
|
2014
|
+
('share', self._share.id),
|
|
2015
|
+
('export_location', self._export_location.id),
|
|
2016
|
+
('property', ['Bobcat']),
|
|
2017
|
+
]
|
|
2018
|
+
|
|
2019
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
2020
|
+
self.cmd.take_action(parsed_args)
|
|
2021
|
+
self.export_locations_mock.delete_metadata.assert_called_once_with(
|
|
2022
|
+
self._share.id, ['Bobcat'],
|
|
2023
|
+
subresource=self._export_location.id)
|
|
2024
|
+
|
|
2025
|
+
def test_share_unset_export_location_property_exception(self):
|
|
2026
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
2027
|
+
'2.87'
|
|
2028
|
+
)
|
|
2029
|
+
arglist = [
|
|
2030
|
+
self._share.id,
|
|
2031
|
+
self._export_location.id,
|
|
2032
|
+
'--property', 'key',
|
|
2033
|
+
]
|
|
2034
|
+
verifylist = [
|
|
2035
|
+
('share', self._share.id),
|
|
2036
|
+
('export_location', self._export_location.id),
|
|
2037
|
+
('property', ['key']),
|
|
2038
|
+
]
|
|
2039
|
+
|
|
2040
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
2041
|
+
self.cmd.take_action(parsed_args)
|
|
2042
|
+
|
|
2043
|
+
self.export_locations_mock.delete_metadata.assert_has_calls([
|
|
2044
|
+
mock.call(self._share.id, ['key'],
|
|
2045
|
+
subresource=self._export_location.id)])
|
|
2046
|
+
|
|
2047
|
+
self.export_locations_mock.delete_metadata.side_effect = (
|
|
2048
|
+
exceptions.NotFound)
|
|
2049
|
+
self.assertRaises(
|
|
2050
|
+
osc_exceptions.CommandError, self.cmd.take_action,
|
|
2051
|
+
parsed_args)
|
|
2052
|
+
|
|
2053
|
+
|
|
1913
2054
|
class TestShowShareProperties(TestShare):
|
|
1914
2055
|
|
|
1915
2056
|
properties = {
|
|
@@ -11,21 +11,17 @@
|
|
|
11
11
|
# under the License.
|
|
12
12
|
#
|
|
13
13
|
|
|
14
|
-
import argparse
|
|
15
14
|
from unittest import mock
|
|
16
15
|
import uuid
|
|
17
16
|
|
|
18
17
|
from osc_lib import exceptions
|
|
19
18
|
from osc_lib import exceptions as osc_exceptions
|
|
20
|
-
|
|
21
19
|
from osc_lib import utils as oscutils
|
|
22
20
|
|
|
23
|
-
from manilaclient.osc import utils
|
|
24
|
-
|
|
25
21
|
from manilaclient import api_versions
|
|
26
|
-
|
|
22
|
+
from manilaclient.osc import utils
|
|
27
23
|
from manilaclient.osc.v2 import share_groups as osc_share_groups
|
|
28
|
-
|
|
24
|
+
from manilaclient.tests.unit.osc import osc_utils
|
|
29
25
|
from manilaclient.tests.unit.osc.v2 import fakes as manila_fakes
|
|
30
26
|
|
|
31
27
|
|
|
@@ -795,7 +791,7 @@ class TestShareGroupList(TestShareGroup):
|
|
|
795
791
|
verifylist = [
|
|
796
792
|
("limit", -2),
|
|
797
793
|
]
|
|
798
|
-
self.assertRaises(
|
|
794
|
+
self.assertRaises(osc_utils.ParserException, self.check_parser,
|
|
799
795
|
self.cmd, arglist, verifylist)
|
|
800
796
|
|
|
801
797
|
# TODO(archanaserver): Add test cases for share-server-id,
|
|
@@ -98,3 +98,13 @@ class ServicesTest(utils.TestCase):
|
|
|
98
98
|
self._get_resource_path(microversion) + '/disable',
|
|
99
99
|
{"host": host, "binary": binary},
|
|
100
100
|
)
|
|
101
|
+
|
|
102
|
+
def test_ensure_shares(self):
|
|
103
|
+
microversion = '2.86'
|
|
104
|
+
manager = self._get_manager(microversion)
|
|
105
|
+
manager.api.client.post = mock.Mock(return_value='fake')
|
|
106
|
+
host = 'fake_host'
|
|
107
|
+
|
|
108
|
+
result = manager.ensure_shares(host)
|
|
109
|
+
|
|
110
|
+
self.assertEqual(result, 'fake')
|
manilaclient/v2/services.py
CHANGED
|
@@ -87,6 +87,12 @@ class ServiceManager(base.Manager):
|
|
|
87
87
|
return self._do_disable(host, binary, RESOURCE_PATH,
|
|
88
88
|
disable_reason=disable_reason)
|
|
89
89
|
|
|
90
|
+
@api_versions.wraps("2.86")
|
|
91
|
+
def ensure_shares(self, host): # noqa
|
|
92
|
+
resource_path = f'{RESOURCE_PATH}/ensure_shares'
|
|
93
|
+
body = {"host": host}
|
|
94
|
+
return self.api.client.post(resource_path, body=body)
|
|
95
|
+
|
|
90
96
|
def server_api_version(self, url_append=""):
|
|
91
97
|
"""Returns the API Version supported by the server.
|
|
92
98
|
|
|
@@ -27,9 +27,11 @@ class ShareExportLocation(base.Resource):
|
|
|
27
27
|
return self._info[key]
|
|
28
28
|
|
|
29
29
|
|
|
30
|
-
class ShareExportLocationManager(base.
|
|
30
|
+
class ShareExportLocationManager(base.MetadataCapableManager):
|
|
31
31
|
"""Manage :class:`ShareExportLocation` resources."""
|
|
32
32
|
resource_class = ShareExportLocation
|
|
33
|
+
resource_path = '/shares'
|
|
34
|
+
subresource_path = '/export_locations'
|
|
33
35
|
|
|
34
36
|
@api_versions.wraps("2.9")
|
|
35
37
|
def list(self, share, search_opts=None):
|
|
@@ -47,3 +49,23 @@ class ShareExportLocationManager(base.ManagerWithFind):
|
|
|
47
49
|
"/shares/%(share_id)s/export_locations/%(export_location_id)s" % {
|
|
48
50
|
"share_id": share_id,
|
|
49
51
|
"export_location_id": export_location_id}, "export_location")
|
|
52
|
+
|
|
53
|
+
@api_versions.wraps('2.87')
|
|
54
|
+
def get_metadata(self, share, share_export_location):
|
|
55
|
+
return super(ShareExportLocationManager, self).get_metadata(
|
|
56
|
+
share, subresource=share_export_location)
|
|
57
|
+
|
|
58
|
+
@api_versions.wraps('2.87')
|
|
59
|
+
def set_metadata(self, resource, metadata, subresource=None):
|
|
60
|
+
return super(ShareExportLocationManager, self).set_metadata(
|
|
61
|
+
resource, metadata, subresource=subresource)
|
|
62
|
+
|
|
63
|
+
@api_versions.wraps('2.87')
|
|
64
|
+
def delete_metadata(self, resource, keys, subresource=None):
|
|
65
|
+
return super(ShareExportLocationManager, self).delete_metadata(
|
|
66
|
+
resource, keys, subresource=subresource)
|
|
67
|
+
|
|
68
|
+
@api_versions.wraps('2.87')
|
|
69
|
+
def update_all_metadata(self, resource, metadata, subresource=None):
|
|
70
|
+
return super(ShareExportLocationManager, self).update_all_metadata(
|
|
71
|
+
resource, metadata, subresource=subresource)
|
|
@@ -17,12 +17,14 @@ Besjana Gjika <besa8383@gmail.com>
|
|
|
17
17
|
Bob Callaway <bob.callaway@netapp.com>
|
|
18
18
|
CaiqueMello <caiquemellosbo@gmail.com>
|
|
19
19
|
Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
|
|
20
|
+
Carlos Eduardo <ces.eduardo98@gmail.com>
|
|
20
21
|
Carlos da Silva <ces.eduardo98@gmail.com>
|
|
21
22
|
ChangBo Guo(gcb) <eric.guo@easystack.cn>
|
|
22
23
|
Chen <dstbtgagt@foxmail.com>
|
|
23
24
|
Chris MacNaughton <chris.macnaughton@canonical.com>
|
|
24
25
|
Christian Berendt <berendt@b1-systems.de>
|
|
25
26
|
Chuck Fouts <fchuck@netapp.com>
|
|
27
|
+
Clifford <emclidon@gmail.com>
|
|
26
28
|
Clifford Emeka <emclidon@gmail.com>
|
|
27
29
|
Clinton Knight <cknight@netapp.com>
|
|
28
30
|
Cloud User <stack@devstack-maari.novalocal>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: python-manilaclient
|
|
3
|
-
Version: 5.
|
|
3
|
+
Version: 5.2.0
|
|
4
4
|
Summary: Client library for OpenStack Manila API.
|
|
5
5
|
Home-page: https://docs.openstack.org/python-manilaclient/latest/
|
|
6
6
|
Author: OpenStack
|
|
@@ -17,11 +17,11 @@ Classifier: Operating System :: OS Independent
|
|
|
17
17
|
Classifier: Programming Language :: Python
|
|
18
18
|
Classifier: Programming Language :: Python :: 3 :: Only
|
|
19
19
|
Classifier: Programming Language :: Python :: 3
|
|
20
|
-
Classifier: Programming Language :: Python :: 3.8
|
|
21
20
|
Classifier: Programming Language :: Python :: 3.9
|
|
22
21
|
Classifier: Programming Language :: Python :: 3.10
|
|
23
22
|
Classifier: Programming Language :: Python :: 3.11
|
|
24
|
-
|
|
23
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
24
|
+
Requires-Python: >=3.9
|
|
25
25
|
Requires-Dist: Babel (>=2.5.0)
|
|
26
26
|
Requires-Dist: PrettyTable (>=0.7.1)
|
|
27
27
|
Requires-Dist: debtcollector (>=1.2.0)
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
manilaclient/__init__.py,sha256=yLvujNabAf28-BYLBD9MEqkumXr9nfohOAOgvce5qxA,1248
|
|
2
|
-
manilaclient/api_versions.py,sha256=
|
|
2
|
+
manilaclient/api_versions.py,sha256=47tCt8M8w2uo8LT2GaO11kxmzBPTxz7sHoRRuAJrHkI,15186
|
|
3
3
|
manilaclient/base.py,sha256=5p-7Wjvf4NnsvFi21XWbFhoDzNVt78cK6t6ePyW-PYs,18340
|
|
4
4
|
manilaclient/client.py,sha256=_8GKDn72tiY34X5qLeNYYm5PGucPuusyTBBcFsTgBlI,2387
|
|
5
5
|
manilaclient/config.py,sha256=pyazLQjW3IbblaSX-PtkRnu49E0oADThFXjR0ijIxYE,10524
|
|
@@ -11,7 +11,7 @@ manilaclient/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
|
|
|
11
11
|
manilaclient/common/_i18n.py,sha256=-ia90LTyuQwvJXncEvUZTmoFk7n3_5B3Cib28B1nev0,1131
|
|
12
12
|
manilaclient/common/cliutils.py,sha256=_JnNgXbwdn-nrJXupv88yhATYFs57slr7IipJR53DVM,8172
|
|
13
13
|
manilaclient/common/constants.py,sha256=cdkAnu5rq3GFWUHiFUwjOlzb8dqwSXN2fN3F4T3iej4,4098
|
|
14
|
-
manilaclient/common/httpclient.py,sha256=
|
|
14
|
+
manilaclient/common/httpclient.py,sha256=ehc_7LKjETIykwfEF06G2vDk9yGTtziemuQ8uJas37k,7217
|
|
15
15
|
manilaclient/common/apiclient/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
16
16
|
manilaclient/common/apiclient/exceptions.py,sha256=Qy3Z84h8bpbhS3OqdNjOg1FVcmy4VxF5lh-xsYr5F6c,12887
|
|
17
17
|
manilaclient/common/apiclient/utils.py,sha256=gP33HSR7G-jaAMtQ32seO_yK84VolsFSqymtzSUg8jE,2781
|
|
@@ -24,8 +24,8 @@ manilaclient/osc/v2/messages.py,sha256=Z_nM0b7GWbYUFf2T-d2q8yWNT4eroYDv1c3LeJsdH
|
|
|
24
24
|
manilaclient/osc/v2/quotas.py,sha256=bRF1U8wjjBqeaDROlB3kyi-2cTA-iElCc677l0hRo_o,14707
|
|
25
25
|
manilaclient/osc/v2/resource_locks.py,sha256=rGsdpkxYA3ZQ4UFTNeq0GDpbb_MZ4b5QJYCxD4duKXs,14033
|
|
26
26
|
manilaclient/osc/v2/security_services.py,sha256=48ML9X7_4iZTlDIFRI9UmvtpW0J7HOC3jb0Kt6S4Wfg,20321
|
|
27
|
-
manilaclient/osc/v2/services.py,sha256=
|
|
28
|
-
manilaclient/osc/v2/share.py,sha256=
|
|
27
|
+
manilaclient/osc/v2/services.py,sha256=CNZweoQqbAdoViU2Q00PYK2PKUrt4B253JzqYeA0YbM,6629
|
|
28
|
+
manilaclient/osc/v2/share.py,sha256=LQCFqBwpykk50RFGJpdD_eV8w7BE2duIxN4XLEOY0NQ,58022
|
|
29
29
|
manilaclient/osc/v2/share_access_rules.py,sha256=815R8utTN3T9LPQ-eC2KPvUrI3HeVUDeh5Pqvw8OH-U,17889
|
|
30
30
|
manilaclient/osc/v2/share_backups.py,sha256=17yE6Z5NrKzpUNuajSBnlaYZy3YRFQT9_ID-DAq3JL8,14055
|
|
31
31
|
manilaclient/osc/v2/share_group_snapshots.py,sha256=Vkq2vK0K7vaDxKl3TBVm_xMWpJZRfn80JIqusLoFiWY,14824
|
|
@@ -114,20 +114,20 @@ manilaclient/tests/unit/osc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
|
|
|
114
114
|
manilaclient/tests/unit/osc/osc_fakes.py,sha256=eOO0huU6P_xz8PGb_nHwlaePFz-9S3GyyUnjlrgu0ag,6610
|
|
115
115
|
manilaclient/tests/unit/osc/osc_utils.py,sha256=8QXJ3Op1QQ9CfKJikheBABLURKqrV4iB9PdX3VvhdUo,2555
|
|
116
116
|
manilaclient/tests/unit/osc/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
117
|
-
manilaclient/tests/unit/osc/v2/fakes.py,sha256=
|
|
117
|
+
manilaclient/tests/unit/osc/v2/fakes.py,sha256=8S2lCDFBlhHnQif__28b4NDVXE4iXrITW9wKuf9XF1w,51766
|
|
118
118
|
manilaclient/tests/unit/osc/v2/test_availability_zones.py,sha256=lXruckwicufvzmp9uutvG9dIm-7UU0lGx9uzXVeAm3o,1963
|
|
119
119
|
manilaclient/tests/unit/osc/v2/test_messages.py,sha256=XiBKFNZNUEmKI9XL-X3G-tE220kiWQ7usvn3QExizW8,6194
|
|
120
120
|
manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=T7v3_Zt1TqWWZiD089fMpdrvuIWEoDo6eYPddajaZCg,16278
|
|
121
121
|
manilaclient/tests/unit/osc/v2/test_resource_locks.py,sha256=8PeAVw2PLDSOII3mXzyzxIfs55cLpUas-t4j-ySCdhQ,10236
|
|
122
122
|
manilaclient/tests/unit/osc/v2/test_security_services.py,sha256=dIZGOgWfY3rAul4IyV2jAImxaewAlMQ8jr9ac1NwniQ,22375
|
|
123
|
-
manilaclient/tests/unit/osc/v2/test_services.py,sha256=
|
|
124
|
-
manilaclient/tests/unit/osc/v2/test_share.py,sha256=
|
|
123
|
+
manilaclient/tests/unit/osc/v2/test_services.py,sha256=VOS29A3XPkZ_e3s-Gpl0kaWg1OO0PIyMIjXhJnwWsro,11077
|
|
124
|
+
manilaclient/tests/unit/osc/v2/test_share.py,sha256=_sSqCsZv4oMIHO0yQ7oStc1hpiKVbTPfjSrhpizfawk,74477
|
|
125
125
|
manilaclient/tests/unit/osc/v2/test_share_access_rules.py,sha256=eDaZ9gM58b66Ea_0nstI0RHOEqE4HbR0kAkaYCLDXr0,20521
|
|
126
126
|
manilaclient/tests/unit/osc/v2/test_share_backups.py,sha256=vegKOqKJ150WSQqMiGbhHw5iMuRUdx_Bt3K-Ae9DKmU,13644
|
|
127
127
|
manilaclient/tests/unit/osc/v2/test_share_group_snapshots.py,sha256=zkchulCEXnzHQxgoVJmSo_LffCnPO2kEAu81sKHiL-8,21560
|
|
128
128
|
manilaclient/tests/unit/osc/v2/test_share_group_type.py,sha256=WCIdqbXqtsWsWZK7CSKkmI1X_8DMb-PR6ZeuTAwtkos,17697
|
|
129
129
|
manilaclient/tests/unit/osc/v2/test_share_group_type_access.py,sha256=d5vgr-B7YhunFjvBpCT2_DlWf7Ob_aIMCHKyx6EmjUQ,6874
|
|
130
|
-
manilaclient/tests/unit/osc/v2/test_share_groups.py,sha256=
|
|
130
|
+
manilaclient/tests/unit/osc/v2/test_share_groups.py,sha256=muLCp8IFUPQ0Dqgh1uwcoRKzX6Jj0Bx4z8EG6g1Oknc,24623
|
|
131
131
|
manilaclient/tests/unit/osc/v2/test_share_instance_export_locations.py,sha256=F0dCdSglHRnt6hux5V_mgcaghAH1h988Y3MmBKnbLDE,5208
|
|
132
132
|
manilaclient/tests/unit/osc/v2/test_share_instances.py,sha256=OCgMnmdhAM6s7aayty9XHwv6Ohq6BFTrFxUhu74LRU8,12339
|
|
133
133
|
manilaclient/tests/unit/osc/v2/test_share_limits.py,sha256=BXXlPJ4fThHKlBdY9OYf7tynSLCqwPstXt1gV6xIrK0,3044
|
|
@@ -166,7 +166,7 @@ manilaclient/tests/unit/v2/test_quota_classes.py,sha256=qS_6zydG7VGVDSuWHUxJLKNx
|
|
|
166
166
|
manilaclient/tests/unit/v2/test_quotas.py,sha256=cTTQ3Y80vMOcaSdHKLBduObiMOnsijugERZRA77lxGo,12085
|
|
167
167
|
manilaclient/tests/unit/v2/test_scheduler_stats.py,sha256=lBT_S-MCEfp8xhdKdMfyLZc7pzuLfajDTHWsP_g8wz0,2962
|
|
168
168
|
manilaclient/tests/unit/v2/test_security_services.py,sha256=TTcvUFYE7dVChhPzaUGrrnRQDXgmNnfMLeIADEYtyKU,8545
|
|
169
|
-
manilaclient/tests/unit/v2/test_services.py,sha256=
|
|
169
|
+
manilaclient/tests/unit/v2/test_services.py,sha256=8jH2B1B2pUswxz2HVWKdEhR5kL3dQIzGBJZDhCbQcuA,4053
|
|
170
170
|
manilaclient/tests/unit/v2/test_share_backups.py,sha256=ysGFNDSEwF1dG5qRQg12Yb38Kl2Oe3XUwkF7gimrzeo,3604
|
|
171
171
|
manilaclient/tests/unit/v2/test_share_export_locations.py,sha256=os6jrWQp8TKCN1XIX3BMgcT-_Qd5L0iLrH7bLEaI4hM,1945
|
|
172
172
|
manilaclient/tests/unit/v2/test_share_group_snapshots.py,sha256=1xfGiwlw7dp_ePCGxtzGlrii1AcSrBQCD7BhmCkw208,9947
|
|
@@ -215,10 +215,10 @@ manilaclient/v2/quotas.py,sha256=JEj7AB-0TBtx0h_TlwjbdW8bT6xrUQ6OUJlosoZVCvk,110
|
|
|
215
215
|
manilaclient/v2/resource_locks.py,sha256=ocB21rxZEUXR5DHOkCuKetta5GEC5oTkAKSo4GPPOpw,4713
|
|
216
216
|
manilaclient/v2/scheduler_stats.py,sha256=jPaDyUqZkHy9DPMHM-nqWKTv-Yii9Qh6YNAy-qqWp_U,1528
|
|
217
217
|
manilaclient/v2/security_services.py,sha256=xhUWdfcd6O3cq0OTjASSpTpUseUeoOgZkwBH2TqdJYM,9732
|
|
218
|
-
manilaclient/v2/services.py,sha256=
|
|
218
|
+
manilaclient/v2/services.py,sha256=Ap0eAxkI2tx8bdZtc_Hshb3THkAj4hiXU_xTenuSAKc,3942
|
|
219
219
|
manilaclient/v2/share_access_rules.py,sha256=XjLl-vk_TOdFRTcGLS8YqzfZAHi1wNHb8VzMJvlBuFI,2994
|
|
220
220
|
manilaclient/v2/share_backups.py,sha256=QQhRWT_txSd3wdGpg4NcrtV_N-wgdmQnhx9y3eOyGtI,4832
|
|
221
|
-
manilaclient/v2/share_export_locations.py,sha256=
|
|
221
|
+
manilaclient/v2/share_export_locations.py,sha256=w72EE6-gQrD69-E4T8pZ4_oalz5lUEKIODCD2TQrRz8,2782
|
|
222
222
|
manilaclient/v2/share_group_snapshots.py,sha256=HmUUC3lbTKeD0j2fB-FyJANbIa3rl3PIThvcvSWsQFo,9326
|
|
223
223
|
manilaclient/v2/share_group_type_access.py,sha256=cbBVrZmfP-U-eqyE0OHUbs0Qlt2yHnJfQlQINetUnOo,3695
|
|
224
224
|
manilaclient/v2/share_group_types.py,sha256=d65K43knC2mbINbp38WfvhhuriEVlHP7-yaPV2d-6sQ,7367
|
|
@@ -241,11 +241,11 @@ manilaclient/v2/shares.py,sha256=Aletqm1t0nO62tBcJGw0QRNPCuN6XgJjPJXCQIl0TCk,321
|
|
|
241
241
|
manilaclient/v2/shell.py,sha256=IrbBbyo5ixaSgqxbM21EKGkoxnbAA5k0R-HXl50nboM,227987
|
|
242
242
|
manilaclient/v2/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
243
243
|
manilaclient/v2/contrib/list_extensions.py,sha256=_JSrPBEca2oR3dUbRNDBahAqo9V4bAEpNx0Si2gOWN4,1448
|
|
244
|
-
python_manilaclient-5.
|
|
245
|
-
python_manilaclient-5.
|
|
246
|
-
python_manilaclient-5.
|
|
247
|
-
python_manilaclient-5.
|
|
248
|
-
python_manilaclient-5.
|
|
249
|
-
python_manilaclient-5.
|
|
250
|
-
python_manilaclient-5.
|
|
251
|
-
python_manilaclient-5.
|
|
244
|
+
python_manilaclient-5.2.0.dist-info/AUTHORS,sha256=roa6rSbgpUcEuhPoutFEYCIa_bkk2R58a6VHogbFRqw,7587
|
|
245
|
+
python_manilaclient-5.2.0.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
|
|
246
|
+
python_manilaclient-5.2.0.dist-info/METADATA,sha256=iv4NLhBjvMAzluqKE2y7yesJjuQWNLpQ3KuSsh5ma6Q,5493
|
|
247
|
+
python_manilaclient-5.2.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
|
|
248
|
+
python_manilaclient-5.2.0.dist-info/entry_points.txt,sha256=ON9iJrTknl9orD1oK47hneAy7fS16KpNO2YLMAaDYgw,11862
|
|
249
|
+
python_manilaclient-5.2.0.dist-info/pbr.json,sha256=SSnqyfMESOCCsx5hqn9YRq6g6LX7tn7jWAKAgYXYFjE,46
|
|
250
|
+
python_manilaclient-5.2.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
|
|
251
|
+
python_manilaclient-5.2.0.dist-info/RECORD,,
|
{python_manilaclient-5.0.0.dist-info → python_manilaclient-5.2.0.dist-info}/entry_points.txt
RENAMED
|
@@ -24,7 +24,9 @@ share_backup_unset = manilaclient.osc.v2.share_backups:UnsetShareBackup
|
|
|
24
24
|
share_create = manilaclient.osc.v2.share:CreateShare
|
|
25
25
|
share_delete = manilaclient.osc.v2.share:DeleteShare
|
|
26
26
|
share_export_location_list = manilaclient.osc.v2.share:ShareExportLocationList
|
|
27
|
+
share_export_location_set = manilaclient.osc.v2.share:ShareExportLocationSet
|
|
27
28
|
share_export_location_show = manilaclient.osc.v2.share:ShareExportLocationShow
|
|
29
|
+
share_export_location_unset = manilaclient.osc.v2.share:ShareExportLocationUnset
|
|
28
30
|
share_group_create = manilaclient.osc.v2.share_groups:CreateShareGroup
|
|
29
31
|
share_group_delete = manilaclient.osc.v2.share_groups:DeleteShareGroup
|
|
30
32
|
share_group_list = manilaclient.osc.v2.share_groups:ListShareGroup
|
|
@@ -112,6 +114,7 @@ share_server_migration_show = manilaclient.osc.v2.share_servers:ShareServerMigra
|
|
|
112
114
|
share_server_migration_start = manilaclient.osc.v2.share_servers:ShareServerMigrationStart
|
|
113
115
|
share_server_set = manilaclient.osc.v2.share_servers:SetShareServer
|
|
114
116
|
share_server_show = manilaclient.osc.v2.share_servers:ShowShareServer
|
|
117
|
+
share_service_ensure_shares = manilaclient.osc.v2.services:EnsureShareService
|
|
115
118
|
share_service_list = manilaclient.osc.v2.services:ListShareService
|
|
116
119
|
share_service_set = manilaclient.osc.v2.services:SetShareService
|
|
117
120
|
share_set = manilaclient.osc.v2.share:SetShare
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"git_version": "31e7ad9", "is_release": true}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"git_version": "87f7249", "is_release": true}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|