Commit Graph

700 Commits

Author SHA1 Message Date
ljhuang 3983e13908 Replace deprecated readfp method with read_file
The readfp method has been deprecated since version 3.2 [1].

[1] https://docs.python.org/3/library/configparser.html?highlight=deprecated#configparser.ConfigParser.readfp

Change-Id: I5246aef8e07b949273b6c3cc31435b4756ae9d1a
2022-07-22 17:22:43 +08:00
Zuul ae75ae3e28 Merge "Use LOG.warning instead of deprecated LOG.warn" 2022-05-09 00:19:25 +00:00
Cai Hui 6d2df5eee9 Fix pylint error
************* Module freezer.engine.rsync.pyrsync
freezer/engine/rsync/pyrsync.py:135:53: E0601: Using variable 'tailsize' before assignment (used-before-assignment)

Change-Id: I86763ae9715fe9ddef483f136c40a3bb8df8a459
2022-05-08 17:44:38 +08:00
Takashi Kajinami 7e145f5624 Use LOG.warning instead of deprecated LOG.warn
The LOG.warn method is deprecated[1] and the LOG.warning method should
be used instead.

[1] https://docs.python.org/3/library/logging.html#logging.warning

Change-Id: I7e721580693a2d81b415a8ae0eb1963456d0195a
2022-01-28 01:16:00 +09:00
Zuul 14401b9290 Merge "Update "if .. if .." to "if .. in .."" 2021-06-10 08:23:52 +00:00
caihui 32337c8d5e Fix the error of tempest test cases for schedule.
The error of  tempest test cases for schedule:

ft1.2: freezer_tempest_plugin.tests.scheduler.test_freezer_scheduler.TestFreezerCmdAction.test_freezer_schedulers_restart[gate]testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/opt/stack/tempest/.tox/tempest/lib/python3.8/site-packages/freezer_tempest_plugin/tests/scheduler/test_freezer_scheduler.py", line 33, in test_freezer_schedulers_restart
    self.run_subprocess(args, "Freezer scheduler restart.")
  File "/opt/stack/tempest/.tox/tempest/lib/python3.8/site-packages/freezer_tempest_plugin/tests/scheduler/base.py", line 76, in run_subprocess
    self.assertEqual(0, proc.returncode,
  File "/opt/stack/tempest/.tox/tempest/lib/python3.8/site-packages/testtools/testcase.py", line 415, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/opt/stack/tempest/.tox/tempest/lib/python3.8/site-packages/testtools/testcase.py", line 502, in assertThat
    raise mismatch_error
testtools.matchers._impl.MismatchError: 0 != 1: Freezer scheduler restart. Output: 2021-06-09 01:05:20.991 116248 CRITICAL freezer-scheduler [-] Unhandled error: OSError: [Errno 88] Socket operation on non-socket
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler Traceback (most recent call last):
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/usr/local/bin/freezer-scheduler", line 10, in <module>
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     sys.exit(main())
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/opt/stack/freezer/freezer/scheduler/freezer_scheduler.py", line 259, in main
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     daemon.restart()
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/opt/stack/freezer/freezer/scheduler/daemon.py", line 204, in restart
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     self.start()
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/opt/stack/freezer/freezer/scheduler/daemon.py", line 178, in start
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     with DaemonContext(pidfile=pidfile, signal_map=self.signal_map,
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/opt/stack/freezer/freezer/lib/pep3143daemon/daemon.py", line 132, in __init__
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     self.detach_process = detach_required()
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/opt/stack/freezer/freezer/lib/pep3143daemon/daemon.py", line 416, in detach_required
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     if parent_is_inet() or parent_is_init():
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/opt/stack/freezer/freezer/lib/pep3143daemon/daemon.py", line 394, in parent_is_inet
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     sock = socket.fromfd(
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/usr/lib/python3.8/socket.py", line 544, in fromfd
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     return socket(family, type, proto, nfd)
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler   File "/usr/lib/python3.8/socket.py", line 231, in __init__
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler     _socket.socket.__init__(self, family, type, proto, fileno)
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler OSError: [Errno 88] Socket operation on non-socket
2021-06-09 01:05:20.991 116248 ERROR freezer-scheduler [00m

Change-Id: I65bb2b620fcc20c3ee3a38cf95cd4280443f77d4
2021-06-10 07:35:10 +08:00
devfu c33d8d98bd Update "if .. if .." to "if .. in .."
Make the code structure looks more clear and more clean.

Change-Id: I5cfce411d7cc182d3ac50170b2ea6a4bc2598525
2021-06-03 16:09:06 +08:00
gecong1973 9773f99feb add test_job_start_session unit test cases
Change-Id: Ia39021e543fea24f686caeacd8dcef964c80f431
2021-02-07 17:30:05 -08:00
gecong1973 71f04ce289 add test_job_execute unit test cases
Change-Id: Icf6a719bc71d1a478d0a232e65d01a3b6617e7e6
2021-02-07 16:09:39 -08:00
gecong1973 98b12b02e0 add test_job_process_event unit test cases
Change-Id: Ifcef7876c3b1930ebd1237e9c1264db8278e332e
2021-02-07 00:50:11 -08:00
gecong1973 ca74ddf145 add test_save_action_to_file unit test cases
Change-Id: I3459d776df233dbe8c36495db3cc113984b44e94
2021-02-06 23:46:23 -08:00
gecong1973 d8b96ff91c add test_job_session_id unit testcases
Change-Id: If11616c358681b2363ea5ff37c1aba726e4d9091
2021-02-06 22:04:18 -08:00
gecong1973 bf49fb0dfc add test_job_create unit testcases
Change-Id: I8955f673b968c34b9b27f6e305f17ab3b6fcfac2
2021-02-06 19:13:39 -08:00
gecong1973 97236a1609 add test_runningstate_remove for unit test
Change-Id: I3db2a946d0950c9b01ee8912c43f7704ffd97c5d
2021-02-06 17:48:01 -08:00
gecong1973 8b26e2738b add test_runningstate_stop for unit test
Change-Id: I33388d127121cc8e017f9db7209ad03773098929
2021-02-06 16:10:40 -08:00
gecong1973 97984c71d6 add test_scheduledstate_start for unit test
Change-Id: Iccd20901384ccee82dbb1e57dc6dddf211cbbcd0
2021-02-05 00:43:18 -08:00
gecong1973 0ea6b00494 add test_scheduledstate_stop for unit test
Change-Id: I75b4025cb207bb0aa59c4325819add1be45cf08e
2021-02-04 21:56:07 -08:00
gecong1973 50885c1041 add test_stopstate_abort for unit test
Change-Id: I850f92470380de21b91406eda28ca01339b61d43
2021-02-04 19:06:38 -08:00
gecong1973 04023a0092 add test_stopstate_stop for unit test
Change-Id: I1abb4eca21a19ee810cf3017116eaf446b94af8b
2021-02-04 17:50:38 -08:00
gecong1973 6e0bed5926 add test_terminate_subprocess1 for unit test
Change-Id: Ibf1b42c7c41aacb4f5d5cb8d2699cb069436f230
2021-02-04 16:22:37 -08:00
gecong1973 543eb4c26c add test_load_doc_from_json_file for unit test
Change-Id: I4afb36f7b87e5c2150ad8f675eeb397fd2b07b69
2021-02-04 01:42:31 -08:00
gecong1973 f4bc498f04 add test_del_register_error for unit test
Change-Id: I3c2ffda9bc861fab98fe0a8fa5b26a5fd8cef0ff
2021-02-03 23:18:06 -08:00
caihui e5f36293e5 Fix CI error
1. no_voting for lower-constraints CI
2.pep8 create: /home/zuul/src/opendev.org/openstack/freezer/.tox/pep8
pep8 installdeps: -c/home/zuul/src/opendev.org/openstack/requirements/upper-constraints.txt, -r/home/zuul/src/opendev.org/openstack/freezer/test-requirements.txt
ERROR: invocation failed (exit code 1), logfile: /home/zuul/src/opendev.org/openstack/freezer/.tox/pep8/log/pep8-1.log
================================== log start ===================================
Looking in indexes: https://mirror.bhs1.ovh.opendev.org/pypi/simple, https://mirror.bhs1.ovh.opendev.org/wheel/ubuntu-20.04-x86_64
Collecting astroid==2.1.0
  Downloading 8809bc008b36396c0cff6279841e8a/astroid-2.1.0-py3-none-any.whl (176 kB)
Collecting pylint==2.3.1
  Downloading b3f73f4ac00277237721ef1c151f0d/pylint-2.3.1-py3-none-any.whl (765 kB)
INFO: pip is looking at multiple versions of <Python from Requires-Python> to determine which version is compatible with other requirements. This could take a while.
INFO: pip is looking at multiple versions of astroid to determine which version is compatible with other requirements. This could take a while.
ERROR: Cannot install -r /home/zuul/src/opendev.org/openstack/freezer/test-requirements.txt (line 23) and astroid==2.1.0 because these package versions have conflicting dependencies.

The conflict is caused by:
    The user requested astroid==2.1.0
    pylint 2.3.1 depends on astroid<3 and >=2.2.0

To fix this you could try to:
1. loosen the range of package versions you've specified
2. remove package versions to allow pip attempt to solve the dependency conflict

ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/user_guide/#fixing-conflicting-dependencies
WARNING: You are using pip version 20.3.3; however, version 21.0 is available.
You should consider upgrading via the '/home/zuul/src/opendev.org/openstack/freezer/.tox/pep8/bin/python -m pip install --upgrade pip' command.
================================ log end ===============================

Change-Id: I898d03d716ebc6c6285c4589cd30f7875b0c51d2
2021-01-28 21:36:03 -08:00
Zuul bb18946a37 Merge "Add utils.streaming test cases" 2020-11-20 10:33:16 +00:00
caihui 659b76e6d9 Add utils.streaming test cases
Add  test cases for freezer.utils.streaming module

Change-Id: I2aa0aacd96c5c614fc2ef39e70d648c7921c056e
2020-11-20 00:09:04 -08:00
Zuul 1ffc2e9072 Merge "Update "if...if..." to "if...elif..."" 2020-11-10 02:14:46 +00:00
caihui 51b4d082d2 Update "if...if..." to "if...elif..."
Improved running efficiency  and  code structure is more clear.

Change-Id: Ib78ccc6c4c4885f7c39ef7db60585626aae95852
2020-11-09 16:31:11 -08:00
zhufl 5ed5b65993 Add missing print format and missing ws in log message
This is to add missing print format parameter and missing white
spaces in the log message.

Change-Id: I76f790f98a9f7f2c7f0cbbbed1d50f5ec057b8c8
2020-10-30 10:21:04 +08:00
gecong1973 b7881e919d add test_restore_cinder unittest for restore
Change-Id: I57defb99814b2c521effa098191f49fcc7759032
2020-10-15 22:32:33 -07:00
gecong1973 6d8b124cb8 add test_create_image unittest for restore
Change-Id: I9d21421c76ad82ae90724b4e14863b5f50a1c593
2020-10-13 02:16:45 -07:00
gecong1973 d5b1e1a621 add test_get_backups_exception unittest for restore
Change-Id: I4cdf72f405786c826fee4635c2b53fb165b205e9
2020-10-12 00:10:41 -07:00
gecong1973 73956bc73c fix a bug for _create_image
Change-Id: I305c9e76fe55740334c3c0a244ed5826a3f082a4
2020-10-11 20:35:30 -07:00
gecong1973 ad88e30ab0 fix a bug for get_backups
Change-Id: Ib5c8198af6722e85e16b4a0f20bbf1fb25bfbe94
2020-10-11 18:53:35 -07:00
gecong1973 03d3488abd add exception details for make_glance_image when exception raise
Change-Id: Ic0897ec562e27b154a9d4e8a2db55baa5768c35c
2020-10-10 01:56:47 -07:00
gecong1973 d08298f0c2 add exception details for provide_snapshot when RuntimeErro
Change-Id: I80b0ec7fc7ffeee964b4660060e7023da7bb6dc9
2020-10-09 20:25:17 -07:00
gecong1973 749d94a6f0 add remove_cinderbackup_older_than unit test for AdminOs
Change-Id: I771c9015b92750283e165b531df9030c277b6f5b
2020-10-09 18:32:41 -07:00
gecong1973 6bedeb78fa add remove_cinderbackup_older_than method for AdminOs
Change-Id: I4948a706cff1635fec950c718ffa0c0fcb624601
2020-09-29 19:32:18 -07:00
gecong1973 bce87a5e59 add unit test for test_del_cinderbackup_and_dependend_incremental
O

Change-Id: I6b72d24f5c9405fee3a3c765099514b774428c72
2020-09-29 07:34:39 +00:00
Zuul e2c4d504ea Merge "Use volume v3 API" 2020-07-01 10:53:42 +00:00
Zuul 2be6ae69d8 Merge "Update ReSizeSteam.next() to ReSizeSteam__next__()" 2020-07-01 10:53:41 +00:00
Caihui 6cb301b71a Use volume v3 API
Volume API v2 has been deprecated for a long time, use alternative version 3 instead.

Change-Id: I9586444e498340189be7ab13a34b7be3778c6f5f
2020-06-30 20:24:53 -07:00
Caihui 7244bef734 Update ReSizeSteam.next() to ReSizeSteam__next__()
1. The bug.
~~~~~~~~~~~~~~~~~~~
    Traceback (most recent call last):

      File "/opt/stack/freezer/freezer/tests/unit/openstack/test_backup.py", line 37, in test_backup_cinder_by_glance
    self.bakup_os.backup_cinder_by_glance(35)

      File "/opt/stack/freezer/freezer/openstack/backup.py", line 79, in backup_cinder_by_glance
    self.storage.add_stream(stream, package, headers=headers)

      File "/opt/stack/freezer/freezer/storage/swift.py", line 163, in add_stream
    for el in stream:

    TypeError: iter() returned non-iterator of type 'ReSizeStream'
2. Fix
In python3.x , a iterator object should be difined two funs " __iter__()" and "__next__()".

Update ReSizeSteam.next() to ReSizeSteam.__next__().

Change-Id: I940841b94789d024d3b9447f96158963fe3e16ee
2020-06-30 19:08:38 -07:00
Zuul fbeec2549c Merge "Update "data" to bytes object" 2020-07-01 01:31:12 +00:00
Caihui 58cb979a40 Update "data" to bytes object
The param "data" in  f.write(data) should be bytes.

Change-Id: Icbf9463c6f406df9cf25a8cf637b0173387582c5
2020-06-30 04:51:37 -07:00
Caihui 3ae26c12fb Fix Type error
The "file_head" is a 'bytes-like object ,not 'str'.

Update file_head.split() to file_head.decode('utf-8').split()

Change-Id: Ic912cc86d9a5afbdbcd63f27e1f91d2140f9b9ba
2020-06-30 04:36:59 -07:00
Caihui 19aae78daf Fix bug "AttributeError: 'generator' object has no attribute 'next'"
1. the bug:
   Captured traceback:
   ~~~~~~~~~~~~~~~~~~~
	Traceback (most recent call last):

	File "/opt/stack/freezer/freezer/tests/unit/scheduler/test_utils.py", line 53, in test_find_config_files_path
	ret = utils.find_config_files(temp_path)

	File "/opt/stack/freezer/freezer/scheduler/utils.py", line 53, in find_config_files
	for fname in os.walk(expanded_path).next()[2]:

	AttributeError: 'generator' object has no attribute 'next'

2. fix:
To get iterobject next element  is  changed to next(iterobject,defalt) in python3.x.

Change-Id: I558bbfecb4a9670a10b1fc649821d88619b7917c
2020-06-30 01:58:27 -07:00
Caihui 7236b3225e Fix bug in python3.x: 'bytes' object has no attribute 'format'
Fix the bug in python3 runtime:
AttributeError: 'bytes' object has no attribute 'format'

Change-Id: I862efca9a09529ef3eb5993c52088924c21e4324
2020-06-30 00:21:34 -07:00
Caihui d2a46346d3 Fix a bug to support python3.x
The default type of the string is str in python3.x,
if want use the type of byte ,should be delcare b'xxxx' .

Change-Id: Ia03aef1f5e51403f5ef1fdba65d0fa231b8889fd
2020-06-29 18:40:53 -07:00
Caihui fdda55acfb Test cases can run in python3.x runtime
Test cases  of test_rsync can run in  python3.x runtime.

Change-Id: I06cda902c6d81b415a7f0baf083a9c14b3dbf89d
2020-06-29 03:42:33 -07:00
Caihui 564675a7f5 Some test cases in test_ftp support python3.X
Some  test cases in test_ftp.py is only support python2.x, update
to support python3.x.

Change-Id: If9b6ecf798285d3bd3b2259cc54b990a07a782f4
2020-06-29 01:37:59 -07:00