diff --git a/lib/prime/vm.sh b/lib/prime/vm.sh index b06c2b1..fe5960b 100644 --- a/lib/prime/vm.sh +++ b/lib/prime/vm.sh @@ -75,5 +75,4 @@ function stop_vm { eval set -- "${FLAGS_ARGV}" qemu_stop_vm "${FLAGS_vm_name}" - } diff --git a/lib/subnet.sh b/lib/subnet.sh index 177fe45..b79ae61 100644 --- a/lib/subnet.sh +++ b/lib/subnet.sh @@ -17,8 +17,8 @@ function check_subnet_exist { print_in_color "${COLOR_GREY}" "Check in linux if ${subnet_name} exist" ip link show | grep -E '^[0-9]*:'|sed -e 's/ //g' | cut -d: -f 2 | grep "br-${subnet_id}" > /dev/null || return 1 ip -n "${vpc_name}" link show | grep -E '^[0-9]*:'|sed -e 's/ //g' | cut -d: -f 2 | grep "br-${subnet_id}" > /dev/null || return 1 - ip link show | grep -E '^[0-9]*:'|sed -e 's/ //g' | cut -d: -f 2 | grep "vs-${subnet_id}-e" > /dev/null || return 1 - ip -n "${vpc_name}" link show | grep -E '^[0-9]*:'|sed -e 's/ //g' | cut -d: -f 2 | grep "vs-${subnet_id}-i" > /dev/null || return 1 + ip link show | grep -E '^[0-9]*:'|sed -e 's/ //g' | cut -d: -f 2 | grep "v-${subnet_id}-e" > /dev/null || return 1 + ip -n "${vpc_name}" link show | grep -E '^[0-9]*:'|sed -e 's/ //g' | cut -d: -f 2 | grep "v-${subnet_id}-i" > /dev/null || return 1 ip link show | grep -E '^[0-9]*:'|sed -e 's/ //g' | cut -d: -f 2 | grep "vxlan-${vxlan_id}" > /dev/null || return 1 return 0 @@ -45,7 +45,7 @@ function create_subnet { add_in_db "subnet" "${subnet_name}" "${vpc_name}" "${vxlan_id}" "${local_ip}" "${gateway_ip}" "${subnet}" print_in_color "${COLOR_GREEN}" " - create veth" - ip link add "vs-${subnet_id}-e" type veth peer name "vs-${subnet_id}-i" netns "${vpc_name}" + ip link add "v-${subnet_id}-e" type veth peer name "v-${subnet_id}-i" netns "${vpc_name}" print_in_color "${COLOR_GREEN}" " - add bridges" brctl addbr "br-${subnet_id}" @@ -61,16 +61,16 @@ function create_subnet { nolearning print_in_color "${COLOR_GREEN}" " - add interface in bridge" - brctl addif "br-${subnet_id}" "vs-${subnet_id}-e" - ip netns exec "${vpc_name}" brctl addif "br-${subnet_id}" "vs-${subnet_id}-i" + brctl addif "br-${subnet_id}" "v-${subnet_id}-e" + ip netns exec "${vpc_name}" brctl addif "br-${subnet_id}" "v-${subnet_id}-i" brctl addif "br-${subnet_id}" "vxlan-${vxlan_id}" print_in_color "${COLOR_GREEN}" " - up interface" - ip link set up dev "vs-${subnet_id}-e" + ip link set up dev "v-${subnet_id}-e" ip link set up dev "vxlan-${vxlan_id}" ip link set up dev "br-${subnet_id}" - ip -n "${vpc_name}" link set up dev "vs-${subnet_id}-i" + ip -n "${vpc_name}" link set up dev "v-${subnet_id}-i" ip -n "${vpc_name}" link set up dev "br-${subnet_id}"