From 731e508bbee9a976b60a61f0a63b743ee8fc29c4 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 1 Apr 2020 08:31:09 -0500
Subject: [PATCH] qa/standalone/mon/msgr-v2-transition: remove test

v2 was introduced in nautilus, and we don't support mimic -> pacific
upgrades (only mimic -> octopus).  This test can be removed!

Signed-off-by: Sage Weil <sage@redhat.com>
---
 qa/standalone/mon/msgr-v2-transition.sh | 82 -------------------------
 1 file changed, 82 deletions(-)
 delete mode 100755 qa/standalone/mon/msgr-v2-transition.sh

diff --git a/qa/standalone/mon/msgr-v2-transition.sh b/qa/standalone/mon/msgr-v2-transition.sh
deleted file mode 100755
index 82a05b5a6a7b3..0000000000000
--- a/qa/standalone/mon/msgr-v2-transition.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-#
-
-source $CEPH_ROOT/qa/standalone/ceph-helpers.sh
-
-function run() {
-    local dir=$1
-    shift
-
-    export CEPH_MON_V1="v1:127.0.0.1:7148" # git grep '\<7148\>' : there must be only one
-    export CEPH_MON_V2="v2:127.0.0.1:7149" # git grep '\<7149\>' : there must be only one
-    export CEPH_ARGS
-    CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
-
-    local funcs=${@:-$(set | ${SED} -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
-    for func in $funcs ; do
-        setup $dir || return 1
-        $func $dir || return 1
-        teardown $dir || return 1
-    done
-}
-
-function TEST_mon_v1_osd_addrs() {
-    local dir=$1
-
-    export CEPH_ARGS="$CEPH_ARGS --mon-host=$CEPH_MON_V1 --mon-debug-no-require-octopus --mon-debug-no-require-nautilus"
-    run_mon $dir a || return 1
-
-    ceph mon dump | grep mon.a | grep $CEPH_MON_V1
-
-    run_osd $dir 0 || return 1
-    wait_for_osd up 0 || return 1
-    ceph osd dump | grep osd.0 | grep v1: || return 1
-    ceph osd dump | grep osd.0 | grep v2: && return 1
-
-    ceph osd require-osd-release nautilus
-
-    ceph osd down 0
-    wait_for_osd up 0 || return 1
-
-    # public should be v1, cluster v2
-    ceph osd dump | grep osd.0 | grep v1: || return 1
-    ceph osd dump -f json | jq '.osds[0].public_addrs.addrvec[0]' | grep v1 || return 1
-    ceph osd dump -f json | jq '.osds[0].cluster_addrs.addrvec[0]' | grep v2 || return 1
-
-    # enable v2 port on mon
-    ceph mon set-addrs a "[$CEPH_MON_V2,$CEPH_MON_V1]"
-
-    ceph osd down 0
-    wait_for_osd up 0 || return 1
-
-    # both public and cluster should be v2+v1
-    ceph osd dump | grep osd.0 | grep v1: || return 1
-    ceph osd dump -f json | jq '.osds[0].public_addrs.addrvec[0]' | grep v2 || return 1
-    ceph osd dump -f json | jq '.osds[0].cluster_addrs.addrvec[0]' | grep v2 || return 1
-}
-
-function TEST_mon_v2v1_osd_addrs() {
-    local dir=$1
-
-    export CEPH_ARGS="$CEPH_ARGS --mon-host=[$CEPH_MON_V2,$CEPH_MON_V1] --mon-debug-no-require-octopus --mon-debug-no-require-nautilus"
-    run_mon $dir a || return 1
-
-    ceph mon dump | grep mon.a | grep $CEPH_MON_V1
-
-    run_osd $dir 0 || return 1
-    wait_for_osd up 0 || return 1
-    ceph osd dump | grep osd.0 | grep v1: || return 1
-    ceph osd dump | grep osd.0 | grep v2: && return 1
-
-    ceph osd require-osd-release nautilus
-
-    ceph osd down 0
-    wait_for_osd up 0 || return 1
-
-    # both public and cluster should be v2+v1
-    ceph osd dump | grep osd.0 | grep v1: || return 1
-    ceph osd dump -f json | jq '.osds[0].public_addrs.addrvec[0]' | grep v2 || return 1
-    ceph osd dump -f json | jq '.osds[0].cluster_addrs.addrvec[0]' | grep v2 || return 1
-}
-
-main msgr-v2-transition "$@"
-- 
2.39.5