Error while remove vxlan on kvm hosts in ACS 4.16

[weizhouapache]

When tested cloudstack with vxlan on kvm hosts, got an error when the last vm/vr is stopped on a kvm host.

2021-06-04 16:17:40,653 DEBUG [kvm.resource.BridgeVifDriver] (agentRequest-Handler-1:null) (logid:c04632d6) Executing: /usr/share/cloudstack-common/scripts/vm/network/vnet/modifyvxlan.sh -o delete -v 1001 -p vx -b brvx-1001 -d true 
2021-06-04 16:17:40,653 DEBUG [kvm.resource.BridgeVifDriver] (agentRequest-Handler-1:null) (logid:c04632d6) Executing while with timeout : 1800000
2021-06-04 16:17:40,656 DEBUG [kvm.resource.BridgeVifDriver] (agentRequest-Handler-1:null) (logid:c04632d6) Exit value is 2
2021-06-04 16:17:40,657 DEBUG [kvm.resource.BridgeVifDriver] (agentRequest-Handler-1:null) (logid:c04632d6) /usr/share/cloudstack-common/scripts/vm/network/vnet/modifyvxlan.sh: illegal option -- dUsage: /usr/share/cloudstack-common/scripts/vm/network/vnet/modifyvxlan.sh: -o <op>(add | delete) -v <vxlan id> -p <pif> -b <bridge name> (-6)
2021-06-04 16:17:40,657 DEBUG [kvm.resource.BridgeVifDriver] (agentRequest-Handler-1:null) (logid:c04632d6) Delete bridge brvx-1001 failed: /usr/share/cloudstack-common/scripts/vm/network/vnet/modifyvxlan.sh: illegal option -- dUsage: /usr/share/cloudstack-common/scripts/vm/network/vnet/modifyvxlan.sh: -o <op>(add | delete) -v <vxlan id> -p <pif> -b <bridge name> (-6)

The vxlan info are not removed (see bridge fdb)

ISSUE TYPE

• Bug Report

COMPONENT NAME

Networking

CLOUDSTACK VERSION

4.16.0.0

CONFIGURATION

OS / ENVIRONMENT

kvm

SUMMARY

STEPS TO REPRODUCE

EXPECTED RESULTS

ACTUAL RESULTS

[weizhouapache]

this seems to be caused by pr #4561

https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java#L379

@Pearl1594 could you please have a look ?

[yadvr]

@weizhouapache I've put 4.15.1.0 as milestone, does it affect 4.15 branch too? cc @Pearl1594

[Pearl1594]

It affects only 4.16 / master @rhtyd