303937f3ae
In an effort to help on migrating changes from neutron to networking-ovn,
these 3 scripts are being introduced under tools.
Also adding documentation about these under OVN folder.
1) files_in_patch.py
Use this to show files that are changed in a patch file.
$ # Make a patch to use as example
$ git show > /tmp/commit.patch
$ ./tools/files_in_patch.py /tmp/commit.patch | grep .py
tools/download_gerrit_change.py
tools/files_in_patch.py
tools/migrate_names.py
2) download_gerrit_change.py
Given a gerrit change id, it will fetch the latest patchset of the change
from review.opendev.org as a patch file.
$ ./tools/download_gerrit_change.py --help
Usage: download_gerrit_change.py [OPTIONS] GERRIT_CHANGE
Options:
-o, --output_patch TEXT Output patch file [default: stdout]
-g, --gerrit_url TEXT The url to Gerrit server [default:
https://review.opendev.org/]
-t, --timeout INTEGER Timeout, in seconds [default: 10]
--help Show this message and exit.
$ ./tools/download_gerrit_change.py 698863 -o /tmp/change.patch
$ ./tools/files_in_patch.py /tmp/change.patch
networking_ovn/ml2/mech_driver.py
networking_ovn/ml2/trunk_driver.py
networking_ovn/tests/unit/ml2/test_mech_driver.py
networking_ovn/tests/unit/ml2/test_trunk_driver.py
3) migrate_names.py
Use this tool to modify the name of the files in a patchfile so it can
be converted to/from the legacy networking-ovn and neutron repositories.
$ ./tools/migrate_names.py --help
Usage: migrate_names.py [OPTIONS]
Options:
-i, --input_patch TEXT input_patch patch file or gerrit change
-o, --output_patch TEXT Output patch file. Default: stdout
-m, --mapfile PATH Data file that specifies mapping to be applied to
input [default: /home/user/openstack/neutron.git
/tools/migrate_names.txt]
--reverse / --no-reverse Map filenames from networking-ovn to Neutron repo
--help Show this message and exit.
$ ./tools/migrate_names.py -i 701646 > /tmp/ovn_change.patch
$ ./tools/migrate_names.py -o /tmp/reverse.patch -i /tmp/ovn_change.patch --reverse
$ diff /tmp/reverse.patch /tmp/ovn_change.patch | grep .py
< --- a/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
< +++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
> --- a/networking_ovn/ml2/mech_driver.py
> +++ b/networking_ovn/ml2/mech_driver.py
<... snip ...>
$ ./tools/files_in_patch.py /tmp/ovn_change.patch
networking_ovn/ml2/mech_driver.py
networking_ovn/ml2/trunk_driver.py
networking_ovn/tests/unit/ml2/test_mech_driver.py
networking_ovn/tests/unit/ml2/test_trunk_driver.py
Change-Id: I17904c996e1357f7292d25aab4d448edb052f44c
Related-Blueprint: neutron-ovn-merge
82 lines
2.4 KiB
Python
Executable File
82 lines
2.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
# Copyright 2020 Red Hat, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import re
|
|
import sys
|
|
|
|
file_names = set()
|
|
|
|
|
|
def parse_input(input_file):
|
|
global file_names
|
|
|
|
while True:
|
|
line_buffer = input_file.readline()
|
|
if not line_buffer:
|
|
break
|
|
line_match = re.search(r"^\s*---\s+([^\s@]+)[\s@]+", line_buffer)
|
|
if not line_match:
|
|
line_match = re.search(r"^\s*\+\+\+\s+([^\s@]+)[\s@]+",
|
|
line_buffer)
|
|
if line_match:
|
|
curr_file_name = line_match.group(1)
|
|
|
|
# trim off 'a/' and 'b/' that you will normally see in git output
|
|
#
|
|
if len(curr_file_name) > 2 and curr_file_name[1] == '/' and (
|
|
curr_file_name[0] == 'a' or curr_file_name[0] == 'b'):
|
|
curr_file_name = curr_file_name[2:]
|
|
|
|
file_names.add(curr_file_name)
|
|
|
|
|
|
def prune_unwanted_names():
|
|
global file_names
|
|
|
|
unwanted_names = set(['/dev/null'])
|
|
|
|
for curr_file_name in file_names:
|
|
# ignore files that end in '.orig' as long as non-.orig exists
|
|
line_match = re.search(r"^(.+)\.[oO][Rr][iI][gG]$", curr_file_name)
|
|
if line_match and line_match.group(1) in file_names:
|
|
unwanted_names.add(curr_file_name)
|
|
continue
|
|
|
|
file_names -= unwanted_names
|
|
|
|
|
|
def print_file_names():
|
|
for name in sorted(file_names):
|
|
print(name)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if len(sys.argv) == 1:
|
|
parse_input(sys.stdin)
|
|
else:
|
|
for curr_input_name in sys.argv[1:]:
|
|
try:
|
|
with open(curr_input_name, 'r') as curr_input_file:
|
|
parse_input(curr_input_file)
|
|
except IOError as e_str:
|
|
sys.stderr.write(
|
|
"Cannot open {}: {}\n".format(curr_input_name, e_str))
|
|
sys.exit(255)
|
|
|
|
prune_unwanted_names()
|
|
print_file_names()
|