Rename every copy of an MTConnect device name, not just the agent's
Set-MachineNumber rewrote one Devices.xml per variant and restarted the agent. That is right for Okuma and eDNC, which keep the device name in that one file - checked across 7 Okuma and 15 eDNC bay captures. Fanuc and Makino keep it in several, and editing only the agent's copy leaves the adapter streaming under the old identity. It has already happened. Seven of thirty-four captured Fanuc bays have the agent on the right machine number and the adapter still on the bay it was imaged from: 4007 on a 7801 Toshulin, 3031 on a 7804, 2005 against 2006 on a dual-spindle pair. Both captured Makino bays have Devices.xml on the machine number and the other three files still on MAKINO-1. Update-MTConnectVariantName renames across a declared set of files with the owning services stopped first. Makino needs that ordering more than most: the vendor's guide says the Adapter Manager rewrites the COMPLETE configuration from memory as it stops, so an edit made while it runs is discarded, and that the name must be identical in every file or the agent may not start. It collects every name in play before rewriting rather than discovering one. A bay half-renamed by the old code carries two at once, and converging on the one that happened to be found leaves the other behind - which is the state this is meant to end, not reproduce. Nothing is written if a service will not stop, and whatever was stopped is started again. Tested on Windows 11 against copies of the real captures: the 7801 bay (adapter 4007) converges to 7801 in two files and leaves the correct agent alone; the 7502 Makino bay converges all four; second runs report no changes. Service ordering verified by process id, using stand-in services - sc.exe fakes named after the real ones are not real services, so the service list is a parameter defaulting to the production names. Does not fix the bays already in this state; they need a run each.
This commit is contained in:
cproudlock
@@ -41,6 +41,135 @@ function Get-CurrentMachineNumber {
|
|||||||
return $result
|
return $result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function Update-MTConnectVariantName {
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Renames an MTConnect device across every file of a variant that carries it.
|
||||||
|
|
||||||
|
.DESCRIPTION
|
||||||
|
Makino and Fanuc do not fit the one-file-one-service shape the other
|
||||||
|
variants do.
|
||||||
|
Per the vendor's "Installation Configuration and Trouble Shooting" guide,
|
||||||
|
the device name lives in several files that must be identical or the agent
|
||||||
|
may not start, and the Adapter Manager service rewrites the COMPLETE
|
||||||
|
configuration when it stops - so an edit made while it runs is thrown away.
|
||||||
|
|
||||||
|
Makino, from a real bay capture:
|
||||||
|
Agent\Devices.xml <Device name="7502" uuid="7502" id="MC41">
|
||||||
|
Agent\Devices.EDM.xml <Device name="MAKINO-1" uuid="MAKINO-1" id="EDM41">
|
||||||
|
Data\AdapterDataFile.xml <Name>MAKINO-1</Name>
|
||||||
|
Agent\Agent.cfg Adapters { MAKINO-1 { Host=localhost ... } }
|
||||||
|
|
||||||
|
Fanuc, likewise:
|
||||||
|
Agent\devices.xml <Device id="3101" name="3101" uuid="3101">
|
||||||
|
Adapter\devices.xml the adapter's own generated copy
|
||||||
|
Adapter\adapter.xml <DeviceName>/<DeviceID>/<DeviceUUID>3101
|
||||||
|
|
||||||
|
Editing only the agent's copy leaves the adapter streaming under the old
|
||||||
|
identity. Seven of thirty-four captured Fanuc bays are in that state -
|
||||||
|
agent on the right machine number, adapter still on the bay it was
|
||||||
|
imaged from (4007 on a 7801 Toshulin, 3031 on a 7804).
|
||||||
|
|
||||||
|
The vendor's own path is ConfigurationManager.exe, a GUI tool, which a
|
||||||
|
remote renumber cannot drive. This does what it does, in the required
|
||||||
|
order: stop the manager and the agent, rewrite, start again.
|
||||||
|
|
||||||
|
Anything that cannot be renamed is reported rather than half-applied -
|
||||||
|
a bay whose files disagree is worse than one still on its old name.
|
||||||
|
#>
|
||||||
|
[CmdletBinding()]
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory)][string]$NewNumber,
|
||||||
|
[Parameter(Mandatory)][hashtable[]]$Targets,
|
||||||
|
# Overridable so the rename can be exercised against a captured bay.
|
||||||
|
[Parameter(Mandatory)][string]$Root,
|
||||||
|
# Whatever owns the files goes down first - for Makino the Adapter
|
||||||
|
# Manager rewrites its configuration from memory as it stops, and for
|
||||||
|
# Fanuc the adapter holds its own copy. Overridable only so a test can
|
||||||
|
# drive the stop/start ordering with real services.
|
||||||
|
[string[]]$Services = @()
|
||||||
|
)
|
||||||
|
|
||||||
|
$out = @{ Updated = @(); Errors = @() }
|
||||||
|
|
||||||
|
$present = @($Targets |
|
||||||
|
ForEach-Object { @{ Path = (Join-Path $Root $_.Path); Kind = $_.Kind } } |
|
||||||
|
Where-Object { Test-Path -LiteralPath $_.Path })
|
||||||
|
if (-not $present) { return $out }
|
||||||
|
|
||||||
|
# Collect EVERY name in play, not just one. A bay half-renamed by the old
|
||||||
|
# code carries two at once - Devices.xml already on the machine number while
|
||||||
|
# the adapter files still say MAKINO-n - and replacing only the name we
|
||||||
|
# happened to discover leaves the other behind, which is the very state this
|
||||||
|
# is meant to end. Gather them all, then converge every file on the target.
|
||||||
|
$names = New-Object System.Collections.Generic.HashSet[string]
|
||||||
|
foreach ($t in $present) {
|
||||||
|
$raw = Get-Content -LiteralPath $t.Path -Raw -ErrorAction SilentlyContinue
|
||||||
|
if (-not $raw) { continue }
|
||||||
|
switch ($t.Kind) {
|
||||||
|
'attr' { if ($raw -match '<Device[^>]+name="([^"]+)"') { [void]$names.Add($matches[1]) } }
|
||||||
|
'name' { if ($raw -match '<Name>\s*([^<]+?)\s*</Name>') { [void]$names.Add($matches[1]) } }
|
||||||
|
'cfg' {
|
||||||
|
# The adapter block's key is the bare line inside Adapters { }.
|
||||||
|
if ($raw -match '(?ms)Adapters\s*\{\s*\r?\n\s*([^\s{]+)') { [void]$names.Add($matches[1]) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
[void]$names.Remove($NewNumber)
|
||||||
|
if ($names.Count -eq 0) { return $out } # every file already on the target
|
||||||
|
|
||||||
|
# Agent is stopped too, so it re-reads Agent.cfg on the way back up.
|
||||||
|
$stopped = @()
|
||||||
|
foreach ($name in $Services) {
|
||||||
|
$svc = Get-Service -Name $name -ErrorAction SilentlyContinue
|
||||||
|
if (-not $svc) { continue }
|
||||||
|
if ($svc.Status -ne 'Stopped') {
|
||||||
|
try {
|
||||||
|
Stop-Service -Name $name -Force -ErrorAction Stop
|
||||||
|
$stopped += $name
|
||||||
|
} catch {
|
||||||
|
$out.Errors += "MTConnect: could not stop '$name' ($_); nothing was changed"
|
||||||
|
foreach ($back in $stopped) {
|
||||||
|
try { Start-Service -Name $back -ErrorAction Stop } catch {}
|
||||||
|
}
|
||||||
|
return $out
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($t in $present) {
|
||||||
|
try {
|
||||||
|
$content = Get-Content -LiteralPath $t.Path -Raw -ErrorAction Stop
|
||||||
|
$updated = $content
|
||||||
|
$from = @()
|
||||||
|
foreach ($old in $names) {
|
||||||
|
$escaped = [regex]::Escape($old)
|
||||||
|
switch ($t.Kind) {
|
||||||
|
'attr' { $next = $updated -replace ('"' + $escaped + '"'), ('"' + $NewNumber + '"') }
|
||||||
|
'name' { $next = $updated -replace ('<Name>\s*' + $escaped + '\s*</Name>'), ("<Name>$NewNumber</Name>") }
|
||||||
|
# The adapter block is keyed by a bare name on its own line.
|
||||||
|
'cfg' { $next = $updated -replace ('(?m)^(\s*)' + $escaped + '(\s*)$'), ("`${1}$NewNumber`${2}") }
|
||||||
|
# <DeviceName>/<DeviceID>/<DeviceUUID> in the Fanuc adapter config
|
||||||
|
'elem' { $next = $updated -replace ('(<Device(?:Name|ID|UUID)>)\s*' + $escaped + '\s*(</Device(?:Name|ID|UUID)>)'), ("`${1}$NewNumber`${2}") }
|
||||||
|
}
|
||||||
|
if ($next -ne $updated) { $from += $old; $updated = $next }
|
||||||
|
}
|
||||||
|
if ($updated -eq $content) { continue } # this file was already done
|
||||||
|
Set-Content -LiteralPath $t.Path -Value $updated -NoNewline -ErrorAction Stop
|
||||||
|
$out.Updated += "$($t.Path) ($($from -join ', ') -> $NewNumber)"
|
||||||
|
} catch {
|
||||||
|
$out.Errors += "MTConnect: rewrite failed for $($t.Path): $_"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($name in $stopped) {
|
||||||
|
try { Start-Service -Name $name -ErrorAction Stop }
|
||||||
|
catch { $out.Errors += "MTConnect: restart of '$name' failed: $_" }
|
||||||
|
}
|
||||||
|
|
||||||
|
return $out
|
||||||
|
}
|
||||||
|
|
||||||
function Update-MachineNumber {
|
function Update-MachineNumber {
|
||||||
<#
|
<#
|
||||||
.SYNOPSIS
|
.SYNOPSIS
|
||||||
@@ -307,11 +436,12 @@ function Update-MachineNumber {
|
|||||||
# devices.xml / Devices.xml entries collapse to the same file). Without
|
# devices.xml / Devices.xml entries collapse to the same file). Without
|
||||||
# this filter, the Okuma branch on an Okuma PC sees the file already
|
# this filter, the Okuma branch on an Okuma PC sees the file already
|
||||||
# rewritten by the (no-op) Fanuc branch and skips the service restart.
|
# rewritten by the (no-op) Fanuc branch and skips the service restart.
|
||||||
|
# Okuma and eDNC keep the name in one file only - verified across 7 Okuma
|
||||||
|
# and 15 eDNC bay captures - so the simple edit is right for them. Fanuc and
|
||||||
|
# Makino are handled below instead.
|
||||||
$mtcVariants = @(
|
$mtcVariants = @(
|
||||||
@{ Service='MTConnect Agent Fanuc'; Path='C:\MTConnect\Agent\devices.xml' },
|
@{ Service='MTConnect Agent Okuma'; Path='C:\MTConnect\Agent\Devices.xml' },
|
||||||
@{ Service='MTConnect Agent Okuma'; Path='C:\MTConnect\Agent\Devices.xml' },
|
@{ Service='MTConnect eDNC Agent'; Path='C:\MTConnect_eDNC\Agent\Devices.xml' }
|
||||||
@{ Service='MTConnect eDNC Agent'; Path='C:\MTConnect_eDNC\Agent\Devices.xml' },
|
|
||||||
@{ Service='Makino MTConnect Agent'; Path='C:\Makino-MTConnect\Agent\Devices.xml' }
|
|
||||||
)
|
)
|
||||||
foreach ($v in $mtcVariants) {
|
foreach ($v in $mtcVariants) {
|
||||||
$svc = Get-Service -Name $v.Service -ErrorAction SilentlyContinue
|
$svc = Get-Service -Name $v.Service -ErrorAction SilentlyContinue
|
||||||
@@ -346,6 +476,43 @@ function Update-MachineNumber {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# --- Multi-file variants: rename every copy, services stopped first ---
|
||||||
|
# Fanuc and Makino each keep the device name in more than one file, and the
|
||||||
|
# agent's copy alone is not enough - the adapter goes on streaming under the
|
||||||
|
# old identity, which is how seven captured Fanuc bays ended up with the
|
||||||
|
# agent on the right machine number and the adapter on the bay it was
|
||||||
|
# imaged from.
|
||||||
|
$multiFileVariants = @(
|
||||||
|
@{
|
||||||
|
Probe = 'MTConnect Agent Fanuc'
|
||||||
|
Root = 'C:\MTConnect'
|
||||||
|
Services = @('MTConnect Adapter Fanuc', 'MTConnect Agent Fanuc')
|
||||||
|
Targets = @(
|
||||||
|
@{ Path = 'Agent\devices.xml'; Kind = 'attr' },
|
||||||
|
@{ Path = 'Adapter\devices.xml'; Kind = 'attr' },
|
||||||
|
@{ Path = 'Adapter\adapter.xml'; Kind = 'elem' }
|
||||||
|
)
|
||||||
|
},
|
||||||
|
@{
|
||||||
|
Probe = 'Makino MTConnect Agent'
|
||||||
|
Root = 'C:\Makino-MTConnect'
|
||||||
|
Services = @('Makino Adapter Manager', 'Makino MTConnect Agent')
|
||||||
|
Targets = @(
|
||||||
|
@{ Path = 'Agent\Devices.xml'; Kind = 'attr' },
|
||||||
|
@{ Path = 'Agent\Devices.EDM.xml'; Kind = 'attr' },
|
||||||
|
@{ Path = 'Data\AdapterDataFile.xml'; Kind = 'name' },
|
||||||
|
@{ Path = 'Agent\Agent.cfg'; Kind = 'cfg' }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
foreach ($variant in $multiFileVariants) {
|
||||||
|
if (-not (Get-Service -Name $variant.Probe -ErrorAction SilentlyContinue)) { continue }
|
||||||
|
$renamed = Update-MTConnectVariantName -NewNumber $NewNumber `
|
||||||
|
-Root $variant.Root -Targets $variant.Targets -Services $variant.Services
|
||||||
|
$out.MTConnectUpdated += $renamed.Updated
|
||||||
|
$out.Errors += $renamed.Errors
|
||||||
|
}
|
||||||
|
|
||||||
# Keep C:\Enrollment\machine-number.txt in sync. Post-imaging GE-Enforce
|
# Keep C:\Enrollment\machine-number.txt in sync. Post-imaging GE-Enforce
|
||||||
# prefers eDNC reg, but imaging-time scripts (Install-FromManifest
|
# prefers eDNC reg, but imaging-time scripts (Install-FromManifest
|
||||||
# TargetMachineNumbers filter, 01-eDNC.ps1, 03-RestoreEDncConfig.ps1)
|
# TargetMachineNumbers filter, 01-eDNC.ps1, 03-RestoreEDncConfig.ps1)
|
||||||
|
|||||||
Reference in New Issue
Block a user