Skip to content

Commit da1141e

Browse files
committed
Removing legacy code
Signed-off-by: Brian O'Connell <brian.oconnell@broadcom.com>
1 parent a537282 commit da1141e

1 file changed

Lines changed: 6 additions & 29 deletions

File tree

VMware.CloudFoundation.InstanceRecovery.psm1

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -557,17 +557,10 @@ Function New-ExtractDataFromSDDCBackup {
557557
$lineContent = $psqlContent | Select-Object -Index $vCentersStartingLineNumber
558558
If ($lineContent -ne '\.') {
559559
$vCenterID = $lineContent.split("`t")[0]
560-
If ($sddcManagerObject.version -like "4.4.*") {
561-
$vCenterVersion = $lineContent.split("`t")[10]
562-
$vCenterFqdn = $lineContent.split("`t")[11]
563-
$vCenterIp = $lineContent.split("`t")[12]
564-
$vCenterVMname = $lineContent.split("`t")[13]
565-
} else {
566-
$vCenterVersion = $lineContent.split("`t")[9]
567-
$vCenterFqdn = $lineContent.split("`t")[10]
568-
$vCenterIp = (Resolve-DnsName $vCenterFqdn).IPAddress
569-
$vCenterVMname = $lineContent.split("`t")[12]
570-
}
560+
$vCenterVersion = $lineContent.split("`t")[9]
561+
$vCenterFqdn = $lineContent.split("`t")[10]
562+
$vCenterIp = (Resolve-DnsName $vCenterFqdn).IPAddress
563+
$vCenterVMname = $lineContent.split("`t")[12]
571564
$vCenterDomainID = ($hostsAndDomains | Where-Object { $_.hostId -eq (($hostsandVcenters | Where-Object { $_.vCenterID -eq $vCenterID })[0].hostID) }).domainID
572565
$vCenters += [pscustomobject]@{
573566
'vCenterID' = $vCenterID
@@ -986,11 +979,7 @@ Function New-ExtractDataFromSDDCBackup {
986979
$domainName = $lineContent.split("`t")[3]
987980
$domainType = $lineContent.split("`t")[6]
988981
$vCenter = $vCenters | Where-Object { $_.vCenterDomainID -eq $domainId }
989-
If ($sddcManagerObject.version -like "4.4.*") {
990-
$ssoDomain = ($pscs | Where-Object { $_.id -eq (($vCentersAndPscs | Where-Object { $_.vcenterId -eq $vcenter.vCenterID }).pscId) }).ssoDomain
991-
} else {
992-
$ssoDomain = $lineContent.split("`t")[11]
993-
}
982+
$ssoDomain = $lineContent.split("`t")[11]
994983
$vCenterDetails = [pscustomobject]@{
995984
'id' = $vCenter.vCenterID
996985
'version' = $vCenter.vCenterVersion
@@ -1012,18 +1001,7 @@ Function New-ExtractDataFromSDDCBackup {
10121001
$vmotionNetwork = $networks | Where-Object { ($_.type -eq "VMOTION") -and ($_.id -in $domainNetworks) }
10131002
$vsanNetwork = $networks | Where-Object { ($_.type -eq "VSAN") -and ($_.id -in $domainNetworks) }
10141003

1015-
<#
1016-
$mgmtNetworkDetails = @()
1017-
$mgmtNetworkDetails += [pscustomobject]@{ #Review
1018-
'type' = "MANAGEMENT"
1019-
'subnet_mask' = $metaDataJSON.netmask
1020-
'subnet' = $managementSubnet
1021-
'mtu' = "1500" # Review
1022-
'vlanID' = ($virtualDistributedSwitches.portgroups | Where-Object { $_.name -eq $metadataJSON.port_group }).vlanId
1023-
'gateway' = $metaDataJSON.gateway
1024-
'portgroupKey' = $metadataJSON.port_group
1025-
}
1026-
#>
1004+
10271005
$nsxClusterDetailsObject = New-Object -type psobject
10281006
$nsxClusterDetailsObject | Add-Member -NotePropertyName 'clusterVip' -NotePropertyValue ($nsxtManagerClusters | Where-Object { $_.domainIDs -contains $domainId }).clusterVip
10291007
$nsxClusterDetailsObject | Add-Member -NotePropertyName 'clusterFqdn' -NotePropertyValue ($nsxtManagerClusters | Where-Object { $_.domainIDs -contains $domainId }).clusterFqdn
@@ -1044,7 +1022,6 @@ Function New-ExtractDataFromSDDCBackup {
10441022
'ssoDomain' = $ssoDomain
10451023
'networkPool' = $poolName
10461024
'vCenterDetails' = $vCenterDetails
1047-
#'mgmtNetworkDetails' = $mgmtNetworkDetails
10481025
'nsxClusterDetails' = $nsxClusterDetailsObject
10491026
'nsxNodeDetails' = ($nsxtManagerClusters | Where-Object { $_.domainIDs -contains $domainId }).nsxNodes
10501027
'vsphereClusterDetails' = @($clusters | Where-Object { $_.vCenterID -eq $vcenterDetails.id })

0 commit comments

Comments
 (0)