From 47a2946e061afbaec9f7d3d7e6bcb9b6f56e468e Mon Sep 17 00:00:00 2001 From: Arthur Coolen <coolen@astron.nl> Date: Tue, 17 Oct 2017 10:11:59 +0000 Subject: [PATCH] Task #10099: central shields for wop57 and wop64 created --- .gitattributes | 4 ++ .../License/471_3031_Astron_Central_4.log | 66 +++++++++++++++++++ .../PVSS/License/Astron_Central_1_shield.txt | 59 ++++++++--------- .../data/PVSS/License/shield.wop57.txt | 31 +++++++++ .../data/PVSS/License/shield.wop64.txt | 31 +++++++++ .../PVSS/License/wop57-Apertif_option.txt | 51 +++++++------- .../PVSS/License/wop64-Apertif_option.txt | 30 +++++++++ 7 files changed, 218 insertions(+), 54 deletions(-) create mode 100644 MAC/Deployment/data/PVSS/License/471_3031_Astron_Central_4.log create mode 100644 MAC/Deployment/data/PVSS/License/shield.wop57.txt create mode 100644 MAC/Deployment/data/PVSS/License/shield.wop64.txt create mode 100644 MAC/Deployment/data/PVSS/License/wop64-Apertif_option.txt diff --git a/.gitattributes b/.gitattributes index cb42d5500f6..959efb57888 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2580,6 +2580,7 @@ MAC/Deployment/data/OTDB/genArrayTest.py -text MAC/Deployment/data/PVSS/License/471_3031_1_Astron_Gen_I_3_314.log -text MAC/Deployment/data/PVSS/License/471_3031_2_Astron_Gen_II_2_311.log -text MAC/Deployment/data/PVSS/License/471_3031_2_Astron_Gen_II_3_314.log -text +MAC/Deployment/data/PVSS/License/471_3031_Astron_Central_4.log -text MAC/Deployment/data/PVSS/License/471_3031_Astron_Station_4.log -text MAC/Deployment/data/PVSS/License/CCU001OLD_option.txt -text MAC/Deployment/data/PVSS/License/CCU099_option.txt -text @@ -2819,9 +2820,12 @@ MAC/Deployment/data/PVSS/License/shield.SE607C.txt -text MAC/Deployment/data/PVSS/License/shield.UK608C-NewLCU.txt -text MAC/Deployment/data/PVSS/License/shield.UK608C.txt -text MAC/Deployment/data/PVSS/License/shield.wop57-Apertif.txt -text +MAC/Deployment/data/PVSS/License/shield.wop57.txt -text +MAC/Deployment/data/PVSS/License/shield.wop64.txt -text MAC/Deployment/data/PVSS/License/shield_developdongles.txt -text MAC/Deployment/data/PVSS/License/shield_developdongles_old.txt -text MAC/Deployment/data/PVSS/License/wop57-Apertif_option.txt -text +MAC/Deployment/data/PVSS/License/wop64-Apertif_option.txt -text MAC/Deployment/data/PVSS/data/AARTFAAC.dpdef -text MAC/Deployment/data/PVSS/data/CEPHardwareMonitor.dpdef -text MAC/Deployment/data/PVSS/data/CEPObservation.dpdef -text diff --git a/MAC/Deployment/data/PVSS/License/471_3031_Astron_Central_4.log b/MAC/Deployment/data/PVSS/License/471_3031_Astron_Central_4.log new file mode 100644 index 00000000000..9387a46eec6 --- /dev/null +++ b/MAC/Deployment/data/PVSS/License/471_3031_Astron_Central_4.log @@ -0,0 +1,66 @@ + +--------------------------------------------------- +[license] +code = "wop57 30058163466" +version = 31500002 +sn = "471_3031_Astron_Central_4/1" +date = 2017.10.17;11:40:54,000 +comment = "MCU.Apertif Central system" +expire = 0000.00.00;00:00:00,000 +redundancy = 1 +ui = 15 +para = 4 +dde = 5 +event = 1 +ios = 100000 +ssi = 0 +api = 80 +excelreport = 5 +http = 15 +infoserver = 5000 +comcenter = 5 +maintenance = 0 +scheduler = 0 +s7 = 1 +distributed = 255 +mobile_app = 1 +s7plus = 8 +uifix = 0 +parafix = 0 +pararemote = 0 +ctrlext = 1 +update = 0 + + +--------------------------------------------------- +[license] +code = "wop64 40504776762" +version = 31500002 +sn = "471_3031_Astron_Central_4/2" +date = 2017.10.17;11:57:15,000 +comment = "Test MCU.Apertif Central system" +expire = 0000.00.00;00:00:00,000 +redundancy = 1 +ui = 15 +para = 4 +dde = 5 +event = 1 +ios = 100000 +ssi = 0 +api = 80 +excelreport = 5 +http = 15 +infoserver = 5000 +comcenter = 5 +maintenance = 0 +scheduler = 0 +s7 = 1 +distributed = 255 +mobile_app = 1 +s7plus = 8 +uifix = 0 +parafix = 0 +pararemote = 0 +ctrlext = 1 +update = 0 + diff --git a/MAC/Deployment/data/PVSS/License/Astron_Central_1_shield.txt b/MAC/Deployment/data/PVSS/License/Astron_Central_1_shield.txt index 1b3f467a552..35c301290a5 100644 --- a/MAC/Deployment/data/PVSS/License/Astron_Central_1_shield.txt +++ b/MAC/Deployment/data/PVSS/License/Astron_Central_1_shield.txt @@ -1,32 +1,31 @@ [license] -#hw = 00825320842 -code = "dongleHost 30182236441" -version = 31500002 -sn = "471_3031_Astron_Central_4" -expire = 0000.00.00;00:00:00,000 -redundancy = 1 -ui = 15 -para = 4 -dde = 5 -event = 1 -api = 80 -excelreport = 5 -http = 15 -infoserver = 5000 -ios = 100000 -comcenter = 5 -maintenance = 0 -scheduler = 0 -ssi = 0 -s7 = 1 -distributed = 255 -mobile_app = 1 -s7plus = 8 -uifix = 0 -parafix = 0 -pararemote = 0 -ctrlext = 1 -update = 0 -licenseMax = 8 -licenseLeft = 8 +code = "dongleHost 00200994633" +version = 31500002 +sn = "471_3031_Astron_Central_4" +expire = 0000.00.00;00:00:00,000 +redundancy = 1 +ui = 15 +para = 4 +dde = 5 +event = 1 +ios = 100000 +ssi = 0 +api = 80 +excelreport = 5 +http = 15 +infoserver = 5000 +comcenter = 5 +maintenance = 0 +scheduler = 0 +s7 = 1 +distributed = 255 +mobile_app = 1 +s7plus = 8 +uifix = 0 +parafix = 0 +pararemote = 0 +ctrlext = 1 +update = 0 +licenseMax = 8 +licenseLeft = 6 diff --git a/MAC/Deployment/data/PVSS/License/shield.wop57.txt b/MAC/Deployment/data/PVSS/License/shield.wop57.txt new file mode 100644 index 00000000000..aa323f98381 --- /dev/null +++ b/MAC/Deployment/data/PVSS/License/shield.wop57.txt @@ -0,0 +1,31 @@ +[license] +code = "wop57 30058163466" +version = 31500002 +sn = "471_3031_Astron_Central_4/1" +date = 2017.10.17;11:40:54,000 +comment = "MCU.Apertif Central system" +expire = 0000.00.00;00:00:00,000 +redundancy = 1 +ui = 15 +para = 4 +dde = 5 +event = 1 +ios = 100000 +ssi = 0 +api = 80 +excelreport = 5 +http = 15 +infoserver = 5000 +comcenter = 5 +maintenance = 0 +scheduler = 0 +s7 = 1 +distributed = 255 +mobile_app = 1 +s7plus = 8 +uifix = 0 +parafix = 0 +pararemote = 0 +ctrlext = 1 +update = 0 + diff --git a/MAC/Deployment/data/PVSS/License/shield.wop64.txt b/MAC/Deployment/data/PVSS/License/shield.wop64.txt new file mode 100644 index 00000000000..6e5b5256084 --- /dev/null +++ b/MAC/Deployment/data/PVSS/License/shield.wop64.txt @@ -0,0 +1,31 @@ +[license] +code = "wop64 40504776762" +version = 31500002 +sn = "471_3031_Astron_Central_4/2" +date = 2017.10.17;11:57:15,000 +comment = "Test MCU.Apertif Central system" +expire = 0000.00.00;00:00:00,000 +redundancy = 1 +ui = 15 +para = 4 +dde = 5 +event = 1 +ios = 100000 +ssi = 0 +api = 80 +excelreport = 5 +http = 15 +infoserver = 5000 +comcenter = 5 +maintenance = 0 +scheduler = 0 +s7 = 1 +distributed = 255 +mobile_app = 1 +s7plus = 8 +uifix = 0 +parafix = 0 +pararemote = 0 +ctrlext = 1 +update = 0 + diff --git a/MAC/Deployment/data/PVSS/License/wop57-Apertif_option.txt b/MAC/Deployment/data/PVSS/License/wop57-Apertif_option.txt index 1f69e8cd83c..5ece97c264b 100644 --- a/MAC/Deployment/data/PVSS/License/wop57-Apertif_option.txt +++ b/MAC/Deployment/data/PVSS/License/wop57-Apertif_option.txt @@ -1,27 +1,30 @@ [license] code = "wop57 30513624712" version = 31500002 -comment = "Apertif WinCC-OA host" -sn = "471_3031_Astron_Station_4" -expire = 0000.00.00;00:00:00,000 -redundancy = 0 -ui = 2 -para = 1 -dde = 5 -event = 1 -ios = 4000 -ssi = 0 -api = 80 -excelreport = 5 -http = 0 -infoserver = 1000 -comcenter = 5 -maintenance = 1 -scheduler = 1 -recipe = 1 -distributed = 255 -uifix = 0 -parafix = 0 -pararemote = 0 -ctrlext = 1 -update = 0 +comment = "MCU.Apertif Central system" +sn = "471_3031_Astron_Central_4" +expire = 0000.00.00;00:00:00,000 +redundancy = 1 +ui = 15 +para = 4 +dde = 5 +event = 1 +api = 80 +excelreport = 5 +http = 15 +infoserver = 5000 +ios = 100000 +comcenter = 5 +maintenance = 0 +scheduler = 0 +ssi = 0 +s7 = 1 +distributed = 255 +mobile_app = 1 +s7plus = 8 +uifix = 0 +parafix = 0 +pararemote = 0 +ctrlext = 1 +update = 0 + diff --git a/MAC/Deployment/data/PVSS/License/wop64-Apertif_option.txt b/MAC/Deployment/data/PVSS/License/wop64-Apertif_option.txt new file mode 100644 index 00000000000..1b88c9eb6df --- /dev/null +++ b/MAC/Deployment/data/PVSS/License/wop64-Apertif_option.txt @@ -0,0 +1,30 @@ +[license] +code = "wop64 00124213564" +version = 31500002 +comment = "Test MCU.Apertif Central system" +sn = "471_3031_Astron_Central_4" +expire = 0000.00.00;00:00:00,000 +redundancy = 1 +ui = 15 +para = 4 +dde = 5 +event = 1 +api = 80 +excelreport = 5 +http = 15 +infoserver = 5000 +ios = 100000 +comcenter = 5 +maintenance = 0 +scheduler = 0 +ssi = 0 +s7 = 1 +distributed = 255 +mobile_app = 1 +s7plus = 8 +uifix = 0 +parafix = 0 +pararemote = 0 +ctrlext = 1 +update = 0 + -- GitLab