Normalization of self-ips and vlan names

F5Networks · May 6, 2016 · d8a87ab · d8a87ab · swormke · May 12, 2016
1 parent da632ee
commit d8a87ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/f5_image_prep/os-functions/os-functions.sh b/lib/f5_image_prep/os-functions/os-functions.sh
@@ -44,6 +44,12 @@ function upcase() {
   echo "$1" | tr '[a-z]' '[A-Z]'
 }
 
+# Normalize VLAN, self-ip, etc... replacing spaces with hyphens. Additional normalizations can be added
+function normalize_name() {
+
+	echo -n $1 | sed -e 's/ /-/g'
+}
+
 function is_false() {
     val=$1
 
@@ -174,7 +180,7 @@ function get_metadata_service_url() {
 	if [[ $? != 0 ]]; then
 		dhcp_server_address=$(get_dhcp_server_address)
 		log "Metadata server at $metadata_url is not available, trying $dhcp_server_address instead..."
-		metadata_url="http://$dhcp_server_address/${OS_METADATA_USER_DATA_PATH}"
+		metadata_url="http://$dhcp_server_address/$OS_METADATA_SERVICE_USER_DATA_PATH"
 		test_metadata_service $metadata_url
 		if [[ $? != 0 ]]; then
 			log "Could not locate a viable metadata server, setting default policy..."

diff --git a/lib/f5_image_prep/os-functions/os-network.sh b/lib/f5_image_prep/os-functions/os-network.sh
@@ -50,9 +50,9 @@ function set_tmm_if_selfip() {
 
 		local dhcp_enabled=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{dhcp})
 		local vlan_prefix=$(get_user_data_value {bigip}{network}{vlan_prefix})
-		local vlan_name=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_name})
+		local vlan_name=$(normalize_name "$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_name})")
 		local selfip_prefix=$(get_user_data_value {bigip}{network}{selfip_prefix})
-		local selfip_name=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{selfip_name})
+		local selfip_name=$(normalize_name "$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{selfip_name})")
 		local selfip_description=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{selfip_description})
 		local selfip_allow_service=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{selfip_allow_service})
 		local device_is_sync=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{is_sync})
@@ -142,7 +142,7 @@ function set_tmm_if_vlan() {
 
 	if [[ $tmm_if =~ $TMM_IF_REGEX ]]; then
 		local vlan_prefix=$(get_user_data_value {bigip}{network}{vlan_prefix})
-		local vlan_name=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_name})
+		local vlan_name=$(normalize_name "$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_name})")
 		local vlan_description=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_description})
 		local vlan_tag=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_tag})
 		local tagged=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{tagged})
@@ -261,7 +261,7 @@ function configure_tmm_ifs() {
 		fi
 
 		# setup self-IP
-		vlan_name=$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_name})
+		vlan_name=$(normalize_name "$(get_user_data_value {bigip}{network}{interfaces}{$tmm_if}{vlan_name})")
 		[[ $(is_false $vlan_name) ]] && vlan_name="${vlan_prefix}${tmm_if}"
 		tmsh list net self one-line | grep -q "vlan $vlan_name"