Author: arkurth
Date: Fri May 15 12:59:55 2009
New Revision: 775116
URL: http://svn.apache.org/viewvc?rev=775116&view=rev
Log:
VCL-23
Fixed a bug in configure_networking.vbs where it wasn't correctly identifying
the public and private adapter names for VMWare images.
Modified:
incubator/vcl/trunk/managementnode/tools/Windows/Scripts/configure_networking.vbs
Modified:
incubator/vcl/trunk/managementnode/tools/Windows/Scripts/configure_networking.vbs
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/tools/Windows/Scripts/configure_networking.vbs?rev=775116&r1=775115&r2=775116&view=diff
==============================================================================
---
incubator/vcl/trunk/managementnode/tools/Windows/Scripts/configure_networking.vbs
(original)
+++
incubator/vcl/trunk/managementnode/tools/Windows/Scripts/configure_networking.vbs
Fri May 15 12:59:55 2009
@@ -245,7 +245,10 @@
End If
' Regular expression to ignore certain network connection names
- strPatternIgnoredAdapterNames = "(loop|vmware|virtual|afs)"
+ strPatternIgnoredAdapterNames = "(loopback|vmnet|afs)"
+
+ ' Regular expression to ignore certain network connection descriptions
+ strPatternIgnoredAdapterDescriptions = "(loopback|virtual|afs)"
' Regular expression to make sure the address is in the correct format
strPatternIPAddress = "((\d{1,3}\.?){4})"
@@ -299,12 +302,14 @@
' Evaluate the regular expressions
strIgnoredAdapterName =
RegExpVal(strPatternIgnoredAdapterNames, NA.Name, 0)
+ strIgnoredAdapterDescription =
RegExpVal(strPatternIgnoredAdapterDescriptions, NA.Description, 0)
strIPAddress = RegExpVal(strPatternIPAddress,
Join(NAC.IPAddress), 0)
strIPAddressMatchPrivate =
RegExpVal(strPatternPrivate, strIPAddress, 0)
strIPAddressMatchNotPublic =
RegExpVal(strPatternNotPublic, strIPAddress, 0)
WScript.Echo "Adpater name: " & NA.Name
WScript.Echo "Ignored adpater name section: " &
strIgnoredAdapterName
+ WScript.Echo "Ignored adpater description
section: " & strIgnoredAdapterDescription
WScript.Echo "IP address: " & strIPAddress
WScript.Echo "Matching VCL private address
section: " & strIPAddressMatchPrivate
WScript.Echo "Matching non-public address
section: " & strIPAddressMatchNotPublic
@@ -313,6 +318,10 @@
If Len(strIgnoredAdapterName) > 0 Then
WScript.Echo "Network adapter " &
NA.Name & " is being ignored because the name contains: " &
strIgnoredAdapterName
+ ' Check if adapter should be ignored
+ Elseif Len(strIgnoredAdapterDescription) > 0
Then
+ WScript.Echo "Network adapter " &
NA.Name & " is being ignored because the description contains: " &
strIgnoredAdapterDescription
+
' Check to make sure a valid IP address was
found
Elseif Len(strIPAddress) = 0 Then
WScript.Echo "IP address is either
blank or not in the correct format: " & NAC.IPAddress
