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.

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

Add missing types required to support aquilon #70

Merged
merged 1 commit into from Aug 26, 2015

Conversation

jrha
Copy link
Member

@jrha jrha commented Jun 8, 2015

We've been carrying these in an aquilon branch in the repository up until now, the recent restructuring of the schema forced me to look at integrating this again.

@jrha jrha added this to the 15.6 milestone Jun 8, 2015
@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/23/
Test PASSed (test).

"timeout" ? long
"actions" ? string[] with is_action_list(SELF)
};
type structure_events = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

newline

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/24/
Test PASSed (test).

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/25/
Test PASSed (test).

"services" ? structure_services{}
"personality" ? structure_personality
"host_environment" ? string
"features" ? nlist
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gombasg I can't find /system/features used in our hosts, was it moved to metadata and this got left behind?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/system/features is used to pass parameters to features. So parameter "bar" for feature "foo" will end up like "/system/features/foo/bar" = ...

@stdweird
Copy link
Member

test this please

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/26/
Test PASSed (test).

@stdweird
Copy link
Member

test this please

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/27/
Test FAILed.

@@ -17,6 +17,13 @@ type structure_export = {
type structure_cluster = {
"name" : string
"type" ? string
"resources" ? structure_resources
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

structure_resources used before defined

@stdweird
Copy link
Member

test this please

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/28/
Test FAILed.

@stdweird
Copy link
Member

@jrha you have the doubtful honour to test new template tests for this repo.
except for some newly introduced bugs, you will also have to cleanup the existing ones, esp in the components.

run the following until no errors occur.

rm -Rf build_temp
mkdir -p build_temp/monitoring/lemon
echo "object template test;" > build_temp/test.pan
echo "declaration template monitoring/lemon/schema; type structure_monitoring = {};" > build_temp/monitoring/lemon/schema.pan
find pan -type f ! -regex '^./build_temp/.*' -name *.pan | xargs sed -n "s/^declaration[ ]\+template[ ]\+\(.*\);/include '\1';/p" >> build_temp/test.pan
find . -type f ! -regex '^./pan/.*' ! -regex '^./build_temp/.*' -name *.pan | xargs sed -n "s/^declaration[ ]\+template[ ]\+\(.*\);/include '\1';/p" >> build_temp/test.pan
find . -type f ! -regex '^./build_temp/.*' -name *.pan | xargs sed -n "s/^\(unique[ ]\+\)\?template[ ]\+\(.*\);/include '\2';/p" >> build_temp/test.pan
panc --output-dir build_temp --include-path .:build_temp build_temp/test.pan

@jrha
Copy link
Member Author

jrha commented Jun 11, 2015

🙊 I accept the "honour".

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/29/
Test FAILed.

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/30/
Test FAILed.

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/31/
Test FAILed.

@gombasg
Copy link

gombasg commented Jul 13, 2015

Btw. there are ideas to ship the schema of broker-generated data with the broker itself. Right now, if we want to export more data from the broker, that means templates need to be updated first, and the scheduling of changes can be problematic sometimes.

But letting the broker export the schema would work only if there was a proper way of extending/subclassing/inheriting from existing types. Otherwise, we'd end up having to use extensible everywhere, which would not be ideal either.

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/32/
Test FAILed.

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/41/
Test FAILed.

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/42/
Test FAILed.

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/43/
Test FAILed.

type structure_system_aquilon = {
"advertise_status" ? boolean
"archetype" ? structure_archetype
"build" ? string with match (SELF, 'build|blind|ready|failed|install')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stricter regexp ^(build|blind|ready|failed|install)$

@stdweird
Copy link
Member

@jrha more restrictive types could be better, but afaik, this comes out of the broker?
@gombasg is ok for you that you ship the relevant schema in dedicated types like quattor/types/aquilon as part of the broker. that way, we can just copy them here in the proper location without modifications.

@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/45/
Test FAILed.

Split aquilon system properites into seperate type
Move structure_resources to before it is used
Move structure_fsdata before first usage
@hpcugentbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://jenkins1.ugent.be/job/template-library-core-pr-builder/46/
Test FAILed.

@jrha
Copy link
Member Author

jrha commented Aug 26, 2015

@stdweird are you happy with this now?

@stdweird
Copy link
Member

yes, tests fail due to something else. i'll merge this.

stdweird added a commit that referenced this pull request Aug 26, 2015
Add missing types required to support aquilon
@stdweird stdweird merged commit 3872ebb into quattor:master Aug 26, 2015
@jrha jrha deleted the aquilon-schema branch August 26, 2015 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants