root@devstack-u2204-93-54:~/cinder-gerrit# git clone "https://review.opendev.org/openstack/cinder" && (cd "cinder" && mkdir -p `git rev-parse --git-dir`/hooks/ && curl -Lo `git rev-parse --git-dir`/hooks/commit-msg https://review.opendev.org/tools/hooks/commit-msg && chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
Cloning into 'cinder'...
remote: Counting objects: 13766, done
remote: Finding sources: 100% (243253/243253)
remote: Total 243253 (delta 139964), reused 189760 (delta 139964)
Receiving objects: 100% (243253/243253), 297.71 MiB | 7.82 MiB/s, done.
Resolving deltas: 100% (139964/139964), done.
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 3094 100 3094 0 0 10231 0 --:--:-- --:--:-- --:--:-- 10245
root@devstack-u2204-93-54:~/cinder-gerrit# cd cinder
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# git review -d 869991
Downloading refs/changes/91/869991/18 from gerrit
Switched to branch "review/unknown/hitachi-vol-replication"
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# vi cinder/volume/drivers/hitachi/hbsd_replication.py
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# git add cinder/volume/drivers/hitachi/hbsd_replication.py
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# git commit --amend
[review/unknown/hitachi-vol-replication bca3d1381] Hitachi: Volume Replication for VSP Driver
Author: Atsushi Kawai <atsushi.kawai.bu@hitachi.com>
Date: Tue Oct 1 16:25:56 2024 +0900
15 files changed, 4838 insertions(+), 207 deletions(-)
create mode 100644 cinder/tests/unit/volume/drivers/hitachi/test_hitachi_hbsd_replication_fc.py
create mode 100644 releasenotes/notes/hitachi-vsp-add-volume-replication-d8079621818cccec.yaml
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# git review
Errors running git rebase --rebase-merges -i remotes/origin/master
Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Auto-merging releasenotes/notes/hitachi-fix-gad-vol-compatibility-e9c62c18f7a12bc7.yaml
CONFLICT (add/add): Merge conflict in releasenotes/notes/hitachi-fix-gad-vol-compatibility-e9c62c18f7a12bc7.yaml
error: could not apply ff2ebfef3... Hitachi: Fix to have compatibility of GAD volumes
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply ff2ebfef3... Hitachi: Fix to have compatibility of GAD volumes
It is likely that your change has a merge conflict. You may resolve it
in the working tree now as described above and then run 'git review'
again, or if you do not want to resolve it yet (note that the change
can not merge until the conflict is resolved) you may run 'git rebase
--abort' then 'git review -R' to upload the change without rebasing.
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# git rebase --abort
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# git push
fatal: The upstream branch of your current branch does not match
the name of your current branch. To push to the upstream branch
on the remote, use
git push origin HEAD:master
To push to the branch of the same name on the remote, use
git push origin HEAD
To choose either option permanently, see push.default in 'git help config'.
root@devstack-u2204-93-54:~/cinder-gerrit/cinder# git log
commit bca3d1381c98bee44bad90538bc3c3593612442f (HEAD -> review/unknown/hitachi-vol-replication)
Author: Atsushi Kawai <atsushi.kawai.bu@hitachi.com>
Date: Tue Oct 1 16:25:56 2024 +0900
Hitachi: Volume Replication for VSP Driver
This patch is to add Volume Replication for the Hitachi VSP driver.
When using the feature, it requires following software licenses in
'Hitachi Remote Replication':
- Universal Replicator
- True Copy
Implements: blueprint hitachi-vsp-add-volume-replication
Change-Id: I09ec5c30a7adb9380e65801bdec3ed0489359181
Signed-off-by: anthonygamboa <anthony.gamboa@hitachivantara.com>