Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix code style issues in sample data deploy scripts #482

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Fix code style issues in sample data deploy scripts #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc3deb1
Add space before and after '.' concatenator in sample data deploy scr…
rowan04 Sep 14, 2023
597928c
Add space after if and foreach in sample data deploy scripts
rowan04 Sep 14, 2023
42764e8
Split up long lines in sample data deploy scripts
rowan04 Sep 21, 2023
a13ac7d
Fix multi-line function calls
rowan04 Sep 28, 2023
f3d39d7
Improve comment syntax in sample data deploy scripts
rowan04 Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions lib/Doctrine/deploy/AddCertificationStatuses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<?php

require_once __DIR__."/../bootstrap.php";
require_once __DIR__."/AddUtils.php";
/* AddNGIs.php: Loads a list of cert statuses from an XML file and inserts them into
* the doctrine prototype.
* XML format is the xml input format of the cert status seed data
require_once __DIR__ . "/../bootstrap.php";
require_once __DIR__ . "/AddUtils.php";
/* AddCertificationStatuses.php: Loads a list of cert statuses from
* an XML file and inserts them into the doctrine prototype.
* XML format is the xml input format of the cert status seed data.
*/
$certStatsFileName = __DIR__ . "/" . $GLOBALS['dataDir'] . "/CertificationStatuses.xml";
$certStatsFileName = __DIR__ . "/" . $GLOBALS['dataDir'] .
"/CertificationStatuses.xml";
$certStats = simplexml_load_file($certStatsFileName);

foreach($certStats as $certStat) {
foreach ($certStats as $certStat) {
$doctrineCertStat = new CertificationStatus();
$name = "";
foreach($certStat as $key => $value) {
if($key == "name") {
foreach ($certStat as $key => $value) {
if ($key == "name") {
$name = (string) $value;
}
}

$doctrineCertStat->setName($name);
$entityManager->persist($doctrineCertStat);
}

$entityManager->flush();
$entityManager->flush();
23 changes: 13 additions & 10 deletions lib/Doctrine/deploy/AddCountries.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
<?php

require_once __DIR__."/../bootstrap.php";
require_once __DIR__."/AddUtils.php";
require_once __DIR__ . "/../bootstrap.php";
require_once __DIR__ . "/AddUtils.php";

/* AddCountries.php: Loads a list of countries from an XML file and inserts them into
* the doctrine prototype.
/* AddCountries.php: Loads a list of countries from an XML file and
* inserts them into the doctrine prototype.
*/

$countriesFileName = __DIR__ . "/" . $GLOBALS['dataDir'] . "/Countries.xml";
$countriesFileName = __DIR__ . "/" . $GLOBALS['dataDir'] .
"/Countries.xml";
$countries = simplexml_load_file($countriesFileName);

foreach($countries as $country) {
foreach ($countries as $country) {
$doctrineCountry = new Country();
$code = "";
$name = "";
foreach($country as $key => $value) {
if($key == "name") {
foreach ($country as $key => $value) {
if ($key == "name") {
$code = (string) $value;
}
if($key == "description") {

if ($key == "description") {
$name = (string) $value;
}
}

$doctrineCountry->setName($name);
$doctrineCountry->setCode($code);
$entityManager->persist($doctrineCountry);
}

$entityManager->flush();
$entityManager->flush();
158 changes: 86 additions & 72 deletions lib/Doctrine/deploy/AddDowntimes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

require_once __DIR__ . "/../bootstrap.php";
require_once __DIR__."/AddUtils.php";
require_once __DIR__.'/../entities/AlreadyLinkedException.php';
require_once __DIR__ . "/AddUtils.php";
require_once __DIR__ . "/../entities/AlreadyLinkedException.php";


// For each of the hostnames below, GOCDB has two SRM services
Expand All @@ -17,69 +17,75 @@
// this out.
//
// The duplicates are all SRM services apart from cert-ce-01 (CE) and
// hyx.grid.icm.edu.pl (Unicore6.StorageManagement) - something may be wrong with the
// SRM service type the PROM GOCDB causing duplicate service eps
// to be registered. Either that or there's a business reason
// hyx.grid.icm.edu.pl (Unicore6.StorageManagement) - something may be
// wrong with the SRM service type the PROM GOCDB causing duplicate
// service eps to be registered. Either that or there's a business reason
// for registering two.
$duplicateSes = array ("se.reef.man.poznan.pl", "lcg05.sinp.msu.ru",
"grid-se.ii.edu.mk",
"storage01.lcg.cscs.ch", "grid002.ics.forth.gr",
"eymir.grid.metu.edu.tr", "torik1.ulakbim.gov.tr",
"hyx.grid.icm.edu.pl", "cert-ce-01.cnaf.infn.it", // cert-ce-01 is a CE, not SRM
"grid-se.ii.edu.mk", "storage01.lcg.cscs.ch",
"grid002.ics.forth.gr", "eymir.grid.metu.edu.tr",
"torik1.ulakbim.gov.tr", "hyx.grid.icm.edu.pl",
"cert-ce-01.cnaf.infn.it", // cert-ce-01 is a CE, not SRM
"se01.mosigrid.utcluj.ro");
// Hack: the above SEs appear twice with the same service type. (nightmare)
// However in most cases both SEs share the same downtimes...

// AddDowntimes.php: Loads a list of downtimes from an
// AddDowntimes.php: Loads a list of downtimes from an
// XML file and inserts them into the doctrine prototype.
// XML format is the output from get_service_endpoints PI query.
//
// XML format is the output from get_downtime PI query.


$allDowntimes = array();
$downtimeFileName = __DIR__ . "/" . $GLOBALS['dataDir'] . "/Downtimes.xml";
$downtimeFileName = __DIR__ . "/" . $GLOBALS['dataDir'] .
"/Downtimes.xml";
$downtimes = simplexml_load_file($downtimeFileName);
$largestV4DowntimePK = 0;

foreach ($downtimes as $downtimeXml) {
// Each "downtimeXML" element is one SE's downtime.
// If a single downtime affects many SEs, each
// SE will be named in a different $downtimeXml that will duplicate
// all the downtime specific fields.
// SE will be named in a different $downtimeXml that will
// duplicate all the downtime specific fields.

foreach($downtimeXml->attributes() as $key => $value) {
if((string) $key == "ID") {
foreach ($downtimeXml->attributes() as $key => $value) {
if ((string) $key == "ID") {
$promId = (int) $value;
}
}

$downtime = null;
// See if we've already entered a downtime with this prom ID
if(isset($allDowntimes[$promId])) {
// load $downtime from db by $promId rather than loading from global array
// This assumes xml ID attribute (without 'G0' appended) is the same as
// xml PRIMARY_KEY attribute.
if (isset($allDowntimes[$promId])) {
// Load $downtime from db by $promId rather than loading from global
// array. This assumes xml ID attribute (without 'G0' appended) is
// the same as xml PRIMARY_KEY attribute.
//
// $downtime = $entityManager->createQuery("select d FROM Downtime d WHERE d.primaryKey = ?1")
// ->setParameter(1, (string) $promId.'G0')
// ->getResult();
// $downtime = $entityManager->createQuery("select d FROM Downtime " .
// "d WHERE d.primaryKey = ?1")
// ->setParameter(
// 1,
// (string) $promId.'G0'
// )
// ->getResult();
$downtime = $allDowntimes[$promId];
}

if(!isset($downtime)) {
if (!isset($downtime)) {
// Create a new downtime, add the SE to it
$downtime = newDowntime($downtimeXml);
// Finds one or more SEs by hostname and service type
$services = findSEs((string) $downtimeXml->HOSTNAME
, (string) $downtimeXml->SERVICE_TYPE);
$services = findSEs(
(string) $downtimeXml->HOSTNAME,
(string) $downtimeXml->SERVICE_TYPE
);

// There are some edge cases where findSEs returns
// more than one SE (see the comment at the top of this file)
// more than one SE (see the comment at the top of this file).
// However if the downtime isn't yet created we always
// link to the first SE found.
if(!isset($services[0])) {
throw new Exception("No SE found with "
. "hostname " . $downtimeXml->HOSTNAME . " ");
if (!isset($services[0])) {
throw new Exception("No SE found with hostname " .
$downtimeXml->HOSTNAME . " ");
}

// Bidirectional link the el and dt
Expand All @@ -91,33 +97,38 @@
$GLOBALS['allDowntimes'][$promId] = $downtime;
} else {
// Find the SE and link it to the downtime
$services = findSEs((string) $downtimeXml->HOSTNAME
, (string) $downtimeXml->SERVICE_TYPE);

if(!isset($services[0])) {
throw new Exception("No SE found with "
. "hostname " . $downtimeXml->HOSTNAME . " ");
$services = findSEs(
(string) $downtimeXml->HOSTNAME,
(string) $downtimeXml->SERVICE_TYPE
);

if (!isset($services[0])) {
throw new Exception("No SE found with hostname " .
$downtimeXml->HOSTNAME . " ");
}

try {
// TODO? - We should probably iterate each el and try to link each
// to this DT. Will still need to throw alreadylinked exception when
// trying to link a SE that is already linked to the downtime
// in order to detect the SE duplicates. But iterating may only be necessary
// if it emerges that there are instances of more than 2 duplicate SEs
// (the duplicate SE count is tested for the expected 2 duplicates
// below in catch block).
// to this DT. Will still need to throw alreadylinked exception
// when trying to link a SE that is already linked to the downtime
// in order to detect the SE duplicates. But iterating may only be
// necessary if it emerges that there are instances of more than 2
// duplicate SEs (the duplicate SE count is tested for the expected
// 2 duplicates below in catch block).
$els = $services[0]->getEndpointLocations();
if(count($els) > 1){
throw new LogicException('Coding error - there should only be one EL per Service');
if (count($els) > 1) {
throw new LogicException('Coding error - there should only ' .
'be one EL per Service');
}

// Check this endpoint isn't already linked to downtime.
// The els have already been persisted/flushed against
// the DB and so already have IDs.
foreach($downtime->getEndpointLocations() as $existingEL) {
if($existingEL == $els[0]) { // their Ids will be the same
throw new AlreadyLinkedException("Downtime {$downtime->getId()} is already "
. "linked to el {$existingEL->getId()}");
foreach ($downtime->getEndpointLocations() as $existingEL) {
if ($existingEL == $els[0]) { // their Ids will be the same
throw new AlreadyLinkedException("Downtime " .
"{$downtime->getId()} is already linked to el " .
"{$existingEL->getId()}");
}
}

Expand All @@ -126,43 +137,46 @@
//$downtime->addService($services[0]);

} catch (Exception $e) {
if($e instanceof AlreadyLinkedException) {
if ($e instanceof AlreadyLinkedException) {
// Downtime is already linked to this SE

// Check whether this exception is caused by a known issue
// with duplicate SEs (see comment at the top of the file).
// Issue is known if two SEs are found and the hostname is
// a known duplicate
// a known duplicate.
$twoSes = false;
if(count($services) == 2) {
if (count($services) == 2) {
$twoSes = true;
} else {
// we will have to deal with this case and link the
throw new Exception("More than duplicate 2 SEs found: ".$services[0]->getHostName());
throw new Exception("More than duplicate 2 SEs found: " .
$services[0]->getHostName());
}

$knownDup = false;
foreach($duplicateSes as $dup) {
if($dup == $services[0]->getHostName()) {
foreach ($duplicateSes as $dup) {
if ($dup == $services[0]->getHostName()) {
$knownDup = true;
}
}

// If the above two tests are true then we've hit an edge case
// where a downtime currently links to one SE that's a known
// duplicate and it needs to link to the other (duplicated) SE.
// The other SE will always be the second result in $services ([1])
if($twoSes && $knownDup) {
// If the above two tests are true then we've hit an edge
// case where a downtime currently links to one SE that's
// a known duplicate and it needs to link to the other
// (duplicated) SE. The other SE will always be the second
// result in $services ([1])
if ($twoSes && $knownDup) {
//$downtime->addService($services[1]);
$els = $services[1]->getEndpointLocations();


// Check this SE isn't already registered
//foreach($downtime->getEndpointLocations() as $existingEL) {
// if($existingEL == $els[0]) {
// throw new AlreadyLinkedException("Downtime {$downtime->getId()} is already "
// . "linked to el {$existingEL->getId()}");
// }
//foreach ($downtime->getEndpointLocations() as $existingEL) {
// if ($existingEL == $els[0]) {
// throw new AlreadyLinkedException("Downtime " .
// "{$downtime->getId()} is already linked to el " .
// "{$existingEL->getId()}");
// }
//}

// Bidirectional link the el and dt
Expand All @@ -173,7 +187,7 @@
}
}

foreach($allDowntimes as $downtime) {
foreach ($allDowntimes as $downtime) {
$GLOBALS['entityManager']->persist($downtime);
}

Expand All @@ -183,11 +197,11 @@
print_r($e);
}

// Creates a new Doctrine downtime entity from the output of a get_downtime
// SimpleXML element.
// Creates a new Doctrine downtime entity from the output of a
// get_downtime SimpleXML element.
function newDowntime($downtimeXml) {
$downtime = new Downtime();
foreach($downtimeXml->attributes() as $key => $value) {
foreach ($downtimeXml->attributes() as $key => $value) {
switch($key) {
case "ID":
$promId = (int) $value;
Expand All @@ -201,10 +215,10 @@ function newDowntime($downtimeXml) {
}
}

// Get the largest v4 downtime PK which is an integer appended by the string 'G0'
// slice off the 'G0' and get the integer value.
// Get the largest v4 downtime PK which is an integer appended by
// the string 'G0' slice off the 'G0' and get the integer value.
$v4pk = (int)substr($primaryKey, 0, strlen($primaryKey)-2);
if($v4pk > $GLOBALS['largestV4DowntimePK']){
if ($v4pk > $GLOBALS['largestV4DowntimePK']) {
$GLOBALS['largestV4DowntimePK'] = $v4pk;
}

Expand Down
20 changes: 11 additions & 9 deletions lib/Doctrine/deploy/AddInfrastructures.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<?php

require_once __DIR__."/../bootstrap.php";
require_once __DIR__."/AddUtils.php";
require_once __DIR__ . "/../bootstrap.php";
require_once __DIR__ . "/AddUtils.php";

/* AddNGIs.php: Loads a list of infrastructures from an XML file and inserts them into
* the doctrine prototype.
/* AddInfrastructures.php: Loads a list of infrastructures from an XML file and
* inserts them into the doctrine prototype.
* XML format is the xml input production status format.
*/
$infrastructureFileName = __DIR__ . "/" . $GLOBALS['dataDir'] . "/Infrastructures.xml";
$infrastructureFileName = __DIR__ . "/" . $GLOBALS['dataDir'] .
"/Infrastructures.xml";
$infs = simplexml_load_file($infrastructureFileName);

foreach($infs as $xmlInf) {
foreach ($infs as $xmlInf) {
$doctrineInf = new Infrastructure();
$name = "";
foreach($xmlInf as $key => $value) {
if($key == "name") {
foreach ($xmlInf as $key => $value) {
if ($key == "name") {
$name = (string) $value;
}
}

$doctrineInf->setName($name);
$entityManager->persist($doctrineInf);
}

$entityManager->flush();
$entityManager->flush();
Loading