Skip to content

Commit

Permalink
Append group name to subsystem NQN
Browse files Browse the repository at this point in the history 
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2308983

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
  • Loading branch information
@gbregman
gbregman committed Sep 5, 2024
1 parent f64e3be commit 4dc4328
Show file tree
Hide file tree
Showing 18 changed files with 81 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ CEPH_SHA=b59673c44bd569f9f3db37f87bced695dec5fcbf
CEPH_DEVEL_MGR_PATH=../ceph

# Atom
ATOM_SHA=ea4461ac526d6b66ccf0f93d693aa31d929932ad
ATOM_SHA=be72d1c50eb7d0c5ad9274795c1b38b3ee261878

# Demo settings
RBD_POOL=rbd
Expand Down
4 changes: 3 additions & 1 deletion control/cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,8 @@ def subsystem_add(self, args):
req = pb2.create_subsystem_req(subsystem_nqn=args.subsystem,
serial_number=args.serial_number,
max_namespaces=args.max_namespaces,
enable_ha=True)
enable_ha=True,
no_group_append=args.no_group_append)
try:
ret = self.stub.create_subsystem(req)
except Exception as ex:
Expand Down Expand Up @@ -809,6 +810,7 @@ def subsystem_list(self, args):
argument("--subsystem", "-n", help="Subsystem NQN", required=True),
argument("--serial-number", "-s", help="Serial number", required=False),
argument("--max-namespaces", "-m", help="Maximum number of namespaces", type=int, required=False),
argument("--no-group-append", help="Do not append gateway group name to the NQN", action='store_true', required=False),
]
subsys_del_args = [
argument("--subsystem", "-n", help="Subsystem NQN", required=True),
Expand Down
11 changes: 9 additions & 2 deletions control/grpc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ def __init__(self, config: GatewayConfig, gateway_state: GatewayStateHandler, rp
self.gateway_name = self.config.get("gateway", "name")
if not self.gateway_name:
self.gateway_name = socket.gethostname()
self.gateway_group = self.config.get("gateway", "group")
override_hostname = self.config.get_with_default("gateway", "override_hostname", "")
if override_hostname:
self.host_name = override_hostname
Expand Down Expand Up @@ -637,7 +636,7 @@ def create_subsystem_safe(self, request, context):
peer_msg = self.get_peer_message(context)

self.logger.info(
f"Received request to create subsystem {request.subsystem_nqn}, enable_ha: {request.enable_ha}, max_namespaces: {request.max_namespaces}, context: {context}{peer_msg}")
f"Received request to create subsystem {request.subsystem_nqn}, enable_ha: {request.enable_ha}, max_namespaces: {request.max_namespaces}, no group append: {request.no_group_append}, context: {context}{peer_msg}")

if not request.enable_ha:
errmsg = f"{create_subsystem_error_prefix}: HA must be enabled for subsystems"
Expand Down Expand Up @@ -667,6 +666,14 @@ def create_subsystem_safe(self, request, context):
self.logger.error(f"{errmsg}")
return pb2.req_status(status = errno.EINVAL, error_message = errmsg)

if context:
if request.no_group_append or not self.gateway_group:
self.logger.info(f"Subsystem NQN will not be changed")
else:
group_name_to_use = self.gateway_group.replace(GatewayState.OMAP_KEY_DELIMITER, "-")
request.subsystem_nqn += f".{group_name_to_use}"
self.logger.info(f"Subsystem NQN was changed to {request.subsystem_nqn}, adding the group name")

# Set client ID range according to group id assigned by the monitor
offset = self.group_id * CNTLID_RANGE_SIZE
min_cntlid = offset + 1
Expand Down
1 change: 1 addition & 0 deletions control/proto/gateway.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ message create_subsystem_req {
string serial_number = 2;
optional uint32 max_namespaces = 3;
bool enable_ha = 4;
optional bool no_group_append = 5;
}

message delete_subsystem_req {
Expand Down
2 changes: 1 addition & 1 deletion mk/demo.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# demo
demo:
$(NVMEOF_CLI) subsystem add --subsystem $(NQN)
$(NVMEOF_CLI) subsystem add --subsystem $(NQN) --no-group-append
$(NVMEOF_CLI) namespace add --subsystem $(NQN) --rbd-pool $(RBD_POOL) --rbd-image $(RBD_IMAGE_NAME) --size $(RBD_IMAGE_SIZE) --rbd-create-image
$(NVMEOF_CLI) listener add --subsystem $(NQN) --host-name `docker ps -q -f name=$(NVMEOF_CONTAINER_NAME)` --traddr $(NVMEOF_IP_ADDRESS) --trsvcid $(NVMEOF_IO_PORT)
$(NVMEOF_CLI_IPV6) listener add --subsystem $(NQN) --host-name `docker ps -q -f name=$(NVMEOF_CONTAINER_NAME)` --traddr $(NVMEOF_IPV6_ADDRESS) --trsvcid $(NVMEOF_IO_PORT) --adrfam IPV6
Expand Down
2 changes: 1 addition & 1 deletion mk/demosecure.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ HOSTNQN2=`cat /etc/nvme/hostnqn | sed 's/......$$/ffffff/'`
NVMEOF_IO_PORT2=`expr $(NVMEOF_IO_PORT) + 1`
# demosecure
demosecure:
$(NVMEOF_CLI) subsystem add --subsystem $(NQN)
$(NVMEOF_CLI) subsystem add --subsystem $(NQN) --no-group-append
$(NVMEOF_CLI) namespace add --subsystem $(NQN) --rbd-pool $(RBD_POOL) --rbd-image $(RBD_IMAGE_NAME) --size $(RBD_IMAGE_SIZE) --rbd-create-image
$(NVMEOF_CLI) listener add --subsystem $(NQN) --host-name `docker ps -q -f name=$(NVMEOF_CONTAINER_NAME)` --traddr $(NVMEOF_IP_ADDRESS) --trsvcid $(NVMEOF_IO_PORT) --secure
$(NVMEOF_CLI) listener add --subsystem $(NQN) --host-name `docker ps -q -f name=$(NVMEOF_CONTAINER_NAME)` --traddr $(NVMEOF_IP_ADDRESS) --trsvcid $(NVMEOF_IO_PORT2)
Expand Down
4 changes: 2 additions & 2 deletions tests/ha/namespaces.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ GW2_ANA=2
GW_INC=2

echo "ℹ️ Step 1: create subsystem $NQN"
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 subsystem add --subsystem $NQN
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 subsystem add --subsystem $NQN --no-group-append
verify_num_namespaces $GW1_IP $NO_NAMESPACE
verify_num_namespaces $GW2_IP $NO_NAMESPACE

Expand All @@ -103,4 +103,4 @@ verify_num_namespaces $GW1_IP $NO_NAMESPACE
verify_num_namespaces $GW2_IP $NO_NAMESPACE

echo "ℹ️ Step 5: delete subsystem $NQN"
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 subsystem del --subsystem $NQN
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 subsystem del --subsystem $NQN
2 changes: 1 addition & 1 deletion tests/ha/setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GW1_IP="$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{
GW2_IP="$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$GW2_NAME")"
NQN="nqn.2016-06.io.spdk:cnode1"

docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 subsystem add --subsystem $NQN
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 subsystem add --subsystem $NQN --no-group-append
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 namespace add --subsystem $NQN --rbd-pool rbd --rbd-image demo_image1 --size 10M --rbd-create-image -l 1
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 namespace add --subsystem $NQN --rbd-pool rbd --rbd-image demo_image2 --size 10M --rbd-create-image -l 2
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 listener add --subsystem $NQN --host-name $GW1_NAME --traddr $GW1_IP --trsvcid 4420
Expand Down
2 changes: 1 addition & 1 deletion tests/ha/setup_4gws.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ NUM_NAMESPACES=32
# Setup
for i in $(seq $NUM_SUBSYSTEMS); do
NQN="nqn.2016-06.io.spdk:cnode$i"
docker compose run --rm nvmeof-cli --server-address $(gw_ip 1) --server-port 5500 subsystem add --subsystem $NQN --max-namespaces $NUM_NAMESPACES
docker compose run --rm nvmeof-cli --server-address $(gw_ip 1) --server-port 5500 subsystem add --subsystem $NQN --max-namespaces $NUM_NAMESPACES --no-group-append
for n in $(seq $NUM_NAMESPACES); do
IMAGE="image_${i}_${n}"
L=$(expr $n % $NUM_GATEWAYS + 1)
Expand Down
2 changes: 1 addition & 1 deletion tests/ha/setup_mtls.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GW1_NAME=$(docker ps --format '{{.ID}}\t{{.Names}}' | awk '$2 ~ /nvmeof/ && $2 ~
GW1_IP="$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$GW1_NAME")"
NQN="nqn.2016-06.io.spdk:cnode1"

docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 --server-cert /etc/ceph/server.crt --client-key /etc/ceph/client.key --client-cert /etc/ceph/client.crt subsystem add --subsystem $NQN
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 --server-cert /etc/ceph/server.crt --client-key /etc/ceph/client.key --client-cert /etc/ceph/client.crt subsystem add --subsystem $NQN --no-group-append
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 --server-cert /etc/ceph/server.crt --client-key /etc/ceph/client.key --client-cert /etc/ceph/client.crt namespace add --subsystem $NQN --rbd-pool rbd --rbd-image demo_image1 --size 10M --rbd-create-image -l 1
#docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 --server-cert /etc/ceph/server.crt --client-key /etc/ceph/client.key --client-cert /etc/ceph/client.crt namespace add --subsystem $NQN --rbd-pool rbd --rbd-image demo_image2 --size 10M --rbd-create-image -l 2
docker compose run --rm nvmeof-cli --server-address $GW1_IP --server-port 5500 --server-cert /etc/ceph/server.crt --client-key /etc/ceph/client.key --client-cert /etc/ceph/client.crt listener add --subsystem $NQN --host-name $GW1_NAME --traddr $GW1_IP --trsvcid 4420
Expand Down
5 changes: 3 additions & 2 deletions tests/ha/start_up.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ echo ℹ️ Running processes of services
docker compose top

echo ℹ️ Send nvme-gw create for all gateways
GW_GROUP=$(grep group ceph-nvmeof.conf | sed 's/^[^=]*=//' | sed 's/^ *//' | sed 's/ *$//')
for i in $(seq $SCALE); do
GW_NAME=$(docker ps --format '{{.ID}}\t{{.Names}}' | grep -v discovery | awk '$2 ~ /nvmeof/ && $2 ~ /'$i'/ {print $1}')
echo 📫 nvme-gw create gateway: \'$GW_NAME\' pool: \'$POOL\', group: \'\' \(empty string\)
docker compose exec -T ceph ceph nvme-gw create $GW_NAME $POOL ''
echo 📫 nvme-gw create gateway: \'$GW_NAME\' pool: \'$POOL\', group: \'$GW_GROUP\'
docker compose exec -T ceph ceph nvme-gw create $GW_NAME $POOL "$GW_GROUP"
done
64 changes: 48 additions & 16 deletions tests/test_cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
pool = "rbd"
subsystem = "nqn.2016-06.io.spdk:cnode1"
subsystem2 = "nqn.2016-06.io.spdk:cnode2"
subsystem3 = "nqn.2016-06.io.spdk:cnode3"
subsystem4 = "nqn.2016-06.io.spdk:cnode4"
discovery_nqn = "nqn.2014-08.org.nvmexpress.discovery"
serial = "Ceph00000000000001"
uuid = "948878ee-c3b2-4d58-a29b-2cff713fc02d"
Expand All @@ -39,21 +41,23 @@
listener_list_big_port = [["-t", host_name, "-a", addr, "-s", "70000"]]
listener_list_wrong_host = [["-t", "WRONG", "-a", addr, "-s", "5015", "-f", "ipv4"]]
config = "ceph-nvmeof.conf"
group_name = "GROUPNAME"

@pytest.fixture(scope="module")
def gateway(config):
"""Sets up and tears down Gateway"""

addr = config.get("gateway", "addr")
port = config.getint("gateway", "port")
config.config["gateway"]["group"] = group_name
config.config["gateway-logs"]["log_level"] = "debug"
ceph_utils = CephUtils(config)

with GatewayServer(config) as gateway:

# Start gateway
gateway.gw_logger_object.set_log_level("debug")
ceph_utils.execute_ceph_monitor_command("{" + f'"prefix":"nvme-gw create", "id": "{gateway.name}", "pool": "{pool}", "group": ""' + "}")
ceph_utils.execute_ceph_monitor_command("{" + f'"prefix":"nvme-gw create", "id": "{gateway.name}", "pool": "{pool}", "group": "{group_name}"' + "}")
gateway.serve()

# Bind the client and Gateway
Expand Down Expand Up @@ -134,52 +138,52 @@ def test_get_gateway_info(self, caplog, gateway):
class TestCreate:
def test_create_subsystem(self, caplog, gateway):
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2016"])
cli(["subsystem", "add", "--subsystem", "nqn.2016", "--no-group-append"])
assert f'NQN "nqn.2016" is too short, minimal length is 11' in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem",
"nqn.2016-06XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"])
"nqn.2016-06XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "--no-group-append"])
assert f"is too long, maximal length is 223" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2014-08.org.nvmexpress:uuid:0"])
cli(["subsystem", "add", "--subsystem", "nqn.2014-08.org.nvmexpress:uuid:0", "--no-group-append"])
assert f"UUID is not the correct length" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2014-08.org.nvmexpress:uuid:9e9134-3cb431-4f3e-91eb-a13cefaabebf"])
cli(["subsystem", "add", "--subsystem", "nqn.2014-08.org.nvmexpress:uuid:9e9134-3cb431-4f3e-91eb-a13cefaabebf", "--no-group-append"])
assert f"UUID is not formatted correctly" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "qqn.2016-06.io.spdk:cnode1"])
cli(["subsystem", "add", "--subsystem", "qqn.2016-06.io.spdk:cnode1", "--no-group-append"])
assert f"doesn't start with" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.016-206.io.spdk:cnode1"])
cli(["subsystem", "add", "--subsystem", "nqn.016-206.io.spdk:cnode1", "--no-group-append"])
assert f"invalid date code" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2X16-06.io.spdk:cnode1"])
cli(["subsystem", "add", "--subsystem", "nqn.2X16-06.io.spdk:cnode1", "--no-group-append"])
assert f"invalid date code" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io.spdk:"])
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io.spdk:", "--no-group-append"])
assert f"must contain a user specified name starting with" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io..spdk:cnode1"])
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io..spdk:cnode1", "--no-group-append"])
assert f"reverse domain is not formatted correctly" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.spdk:cnode1"])
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.spdk:cnode1", "--no-group-append"])
assert f"reverse domain is not formatted correctly" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io.-spdk:cnode1"])
cli(["subsystem", "add", "--subsystem", "nqn.2016-06.io.-spdk:cnode1", "--no-group-append"])
assert f"reverse domain is not formatted correctly" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", f"{subsystem}_X"])
cli(["subsystem", "add", "--subsystem", f"{subsystem}_X", "--no-group-append"])
assert f"Invalid NQN" in caplog.text
assert f"contains invalid characters" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", subsystem, "--max-namespaces", "2049"])
cli(["subsystem", "add", "--subsystem", subsystem, "--max-namespaces", "2049", "--no-group-append"])
assert f"create_subsystem {subsystem}: True" in caplog.text
cli(["--format", "json", "subsystem", "list"])
assert f'"serial_number": "{serial}"' not in caplog.text
assert f'"nqn": "{subsystem}"' in caplog.text
assert f'"max_namespaces": 2049' in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", subsystem2, "--serial-number", serial])
cli(["subsystem", "add", "--subsystem", subsystem2, "--serial-number", serial, "--no-group-append"])
assert f"create_subsystem {subsystem2}: True" in caplog.text
caplog.clear()
cli(["--format", "json", "subsystem", "list"])
Expand Down Expand Up @@ -234,6 +238,15 @@ def test_create_subsystem_with_discovery_nqn(self, caplog, gateway):
pass
assert "Can't add a discovery subsystem" in caplog.text
assert rc == 2
caplog.clear()
rc = 0
try:
cli(["subsystem", "add", "--subsystem", discovery_nqn, "--no-group-append"])
except SystemExit as sysex:
rc = int(str(sysex))
pass
assert "Can't add a discovery subsystem" in caplog.text
assert rc == 2

def test_add_namespace_wrong_balancing_group(self, caplog, gateway):
caplog.clear()
Expand Down Expand Up @@ -911,7 +924,7 @@ def test_create_subsystem_ana(self, caplog, gateway):
cli(["subsystem", "list"])
assert "No subsystems" in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", subsystem])
cli(["subsystem", "add", "--subsystem", subsystem, "--no-group-append"])
assert f"Adding subsystem {subsystem}: Successful" in caplog.text
caplog.clear()
cli(["subsystem", "list"])
Expand Down Expand Up @@ -955,6 +968,25 @@ def test_delete_subsystem_ana(self, caplog, gateway):
cli(["subsystem", "list"])
assert "No subsystems" in caplog.text

class TestSubsysWithGroupName:
def test_create_subsys_group_name(self, caplog, gateway):
caplog.clear()
cli(["subsystem", "add", "--subsystem", subsystem3])
assert f"Subsystem NQN was changed to {subsystem3}.{group_name}, adding the group name" in caplog.text
assert f"create_subsystem {subsystem3}.{group_name}: True" in caplog.text
assert f"create_subsystem {subsystem3}: True" not in caplog.text
cli(["--format", "json", "subsystem", "list"])
assert f'"nqn": "{subsystem3}.{group_name}"' in caplog.text
assert f'"nqn": "{subsystem3}"' not in caplog.text
caplog.clear()
cli(["subsystem", "add", "--subsystem", subsystem4, "--no-group-append"])
assert f"Subsystem NQN will not be changed" in caplog.text
assert f"create_subsystem {subsystem4}.{group_name}: True" not in caplog.text
assert f"create_subsystem {subsystem4}: True" in caplog.text
cli(["--format", "json", "subsystem", "list"])
assert f'"nqn": "{subsystem4}.{group_name}"' not in caplog.text
assert f'"nqn": "{subsystem4}"' in caplog.text

class TestGwLogLevel:
def test_gw_log_level(self, caplog, gateway):
caplog.clear()
Expand Down
1 change: 1 addition & 0 deletions tests/test_cli_change_lb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def two_gateways(config):
sockA = f"spdk_{nameA}.sock"
sockB = f"spdk_{nameB}.sock"
config.config["gateway-logs"]["log_level"] = "debug"
config.config["gateway"]["group"] = ""
addr = config.get("gateway", "addr")
configA = copy.deepcopy(config)
configB = copy.deepcopy(config)
Expand Down
1 change: 1 addition & 0 deletions tests/test_grpc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def check_resource_by_index(i, caplog):
# for pytest. In order for the test to fail in such a case we need to ask pytest to regard this as an error
@pytest.mark.filterwarnings("error::pytest.PytestUnhandledThreadExceptionWarning")
def test_create_get_subsys(caplog, config):
config.config["gateway"]["group"] = ""
ceph_utils = CephUtils(config)
with GatewayServer(config) as gateway:
ceph_utils.execute_ceph_monitor_command("{" + f'"prefix":"nvme-gw create", "id": "{gateway.name}", "pool": "{pool}", "group": ""' + "}")
Expand Down
2 changes: 1 addition & 1 deletion tests/test_multi_gateway.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def test_multi_gateway_coordination(config, image, conn):

# Send requests to create a subsystem with one namespace to GatewayA
subsystem_req = pb2.create_subsystem_req(subsystem_nqn=nqn, max_namespaces=256,
serial_number=serial, enable_ha=True)
serial_number=serial, enable_ha=True, no_group_append=True)
namespace_req = pb2.namespace_add_req(subsystem_nqn=nqn,
rbd_pool_name=pool,
rbd_image_name=image,
Expand Down
Loading

0 comments on commit 4dc4328

Please sign in to comment.