Skip to content

Commit

Permalink
Multi realm installs - Allow for modification of enabled realms… (#1004)
Browse files Browse the repository at this point in the history
* Split artifact files up by realm
* Allow for selection of enabled realms with tests passing
  • Loading branch information
tpetrus authored and plessbd committed Aug 16, 2019
1 parent 048bf67 commit 41849f9
Show file tree
Hide file tree
Showing 148 changed files with 12,142 additions and 10,032 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Numerous always-ignore extensions
*.diff
#*.diff
*.err
*.orig
*.log
Expand Down
4 changes: 1 addition & 3 deletions classes/XDAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,11 @@ public function enumerateResourceProviders()
{
return $this->modw->query("
SELECT DISTINCT
resource_organization_id AS id,
o.id AS id,
o.abbrev AS organization,
o.name AS name
FROM
modw_aggregates.jobfact_by_quarter,
organization o
WHERE o.id = resource_organization_id
ORDER BY o.abbrev ASC
");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"code": "openstack",
"name": "OpenStack"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"code": "openstack",
"shared_jobs": "0"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"code": "frearson",
"name": "Frearson"
},
{
"code": "mortorq",
"name": "Mortorq"
},
{
"code": "phillips",
"name": "Phillips"
},
{
"code": "pozidriv",
"name": "Posidriv"
},
{
"code": "robertson",
"name": "Robertson"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"code": "frearson",
"shared_jobs": "0"
},
{
"code": "mortorq",
"shared_jobs": "0"
},
{
"code": "phillips",
"shared_jobs": "0"
},
{
"code": "pozidriv",
"shared_jobs": "0"
},
{
"code": "robertson",
"shared_jobs": "0"
}
]

This file was deleted.

34 changes: 0 additions & 34 deletions tests/artifacts/xdmod/integration/database/output/shared_jobs.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"code": "recex",
"name": "Recex"
},
{
"code": "torx",
"name": "Torx"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"code": "recex",
"shared_jobs": "0"
},
{
"code": "torx",
"shared_jobs": "0"
}
]
57 changes: 57 additions & 0 deletions tests/artifacts/xdmod/schema/get-menus.spec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"title": "get-menus",
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"text": {
"type":"string"
},
"id": {
"type":"string"
},
"group_by": {
"type":"string"
},
"query_group": {
"type":"string"
},
"category": {
"type":"string"
},
"realm": {
"type":"string"
},
"defaultChartSettings": {
"type":"string"
},
"chartSettings": {
"type":"string"
},
"node_type": {
"type":"string"
},
"iconCls": {
"type":"string"
},
"description": {
"type":"string"
},
"leaf": {
"type":"boolean"
},
"disabled": {
"type":"boolean"
}
},
"required": [
"text",
"id",
"node_type",
"iconCls",
"leaf"
]
}
}
21 changes: 21 additions & 0 deletions tests/artifacts/xdmod/schema/integration/resource_names.spec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"title": "resource_names",
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"code": {
"type":"string"
},
"name": {
"type":"string"
}
},
"required": [
"code",
"name"
]
}
}
21 changes: 21 additions & 0 deletions tests/artifacts/xdmod/schema/integration/shared_jobs.spec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"title": "resource_names",
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"code": {
"type":"string"
},
"shared_jobs": {
"type":"string"
}
},
"required": [
"code",
"shared_jobs"
]
}
}
Loading

0 comments on commit 41849f9

Please sign in to comment.