Add an argument to control whether swap is added
Add ip_to_mac function in new clhelpers file