Skip to content

Catalog internal references #748

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

Merged
asfgit merged 3 commits into from
Jun 30, 2017
Merged

Catalog internal references #748

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
758b359
repair what i think the test was supposed to test
ahgittin Jun 28, 2017
fb3dcbe
add another catalog internal reference failure case and the correspon…
ahgittin Jun 28, 2017
178aeee
expand tests for completeness
ahgittin Jun 29, 2017
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
126 changes: 121 additions & 5 deletions camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,24 @@ public void testAnonymousReferenceYamlAsChild() throws Exception {

@Test
public void testCatalogReferencingYamlUrl() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
" id: yaml.reference",
" version: " + TEST_VERSION,
" itemType: entity",
" item: classpath://yaml-ref-entity.yaml");

String entityName = "YAML -> catalog item -> yaml url";
Entity app = createAndStartApplication(
"services:",
"- name: " + entityName,
" type: " + ver("yaml.reference"));

checkChildEntitySpec(app, entityName);
}

@Test
public void testCatalogReferencingYamlUrlAsType() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
" id: yaml.reference",
Expand Down Expand Up @@ -127,22 +145,96 @@ public void testYamlUrlReferencingCatalog() throws Exception {
checkChildEntitySpec(app, entityName);
}

@Test(groups="WIP") //Not able to use caller provided catalog items when referencing entity specs (as opposed to catalog meta)
public void testYamlUrlReferencingCallerCatalogItem() throws Exception {
@Test
public void testYamlReferencingEarlierItemShortForm() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
" itemType: entity",
" items:",
" - id: yaml.basic",
" version: " + TEST_VERSION,
" item:",
" type: org.apache.brooklyn.entity.stock.BasicEntity",
" - id: yaml.reference",
" version: " + TEST_VERSION,
" item:",
" type: yaml.basic");

String entityName = "YAML -> catalog item -> yaml url";
Entity app = createAndStartApplication(
"services:",
"- name: " + entityName,
" type: " + ver("yaml.reference"));

checkChildEntitySpec(app, entityName);
}

@Test(groups="WIP") // references to earlier items only work with short form syntax
public void testYamlReferencingEarlierItemLongFormEntity() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
" itemType: entity",
" items:",
" - id: yaml.standalone",
" - id: yaml.basic",
" version: " + TEST_VERSION,
" item:",
" services:",
" - type: org.apache.brooklyn.entity.stock.BasicEntity",
" - id: yaml.reference",
" version: " + TEST_VERSION,
" item:",
// deliberately: discouraged syntax for itemType entity
" services:",
" - type: yaml.basic");

String entityName = "YAML -> catalog item -> yaml url";
Entity app = createAndStartApplication(
"services:",
"- name: " + entityName,
" type: " + ver("yaml.reference"));

checkChildEntitySpec(app, entityName);
}

@Test // references work fine with templates because we don't parse templates
public void testYamlReferencingEarlierItemLongFormTemplate() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
" itemType: template",
" items:",
" - id: yaml.basic",
" version: " + TEST_VERSION,
" item:",
" services:",
" - type: org.apache.brooklyn.entity.stock.BasicApplication",
" - type: org.apache.brooklyn.entity.stock.BasicEntity",
" - id: yaml.reference",
" version: " + TEST_VERSION,
" item:",
" services:",
" - type: classpath://yaml-ref-parent-catalog.yaml");
" - type: yaml.basic");

String entityName = "YAML -> catalog item -> yaml url";
Entity app = createAndStartApplication(
"services:",
"- name: " + entityName,
" type: " + ver("yaml.reference"));

checkChildEntitySpec(app, entityName);
}

@Test(groups="WIP") //Not able to use caller provided catalog items when referencing entity specs (as opposed to catalog meta)
public void testYamlReferencingEarlierItemInUrl() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
" itemType: entity",
" items:",
" - id: yaml.basic",
" version: " + TEST_VERSION,
" item:",
" type: org.apache.brooklyn.entity.stock.BasicApplication",
" - id: yaml.reference",
" version: " + TEST_VERSION,
" item: classpath://yaml-ref-catalog.yaml"); // this references yaml.basic above

String entityName = "YAML -> catalog item -> yaml url";
Entity app = createAndStartApplication(
Expand All @@ -152,7 +244,31 @@ public void testYamlUrlReferencingCallerCatalogItem() throws Exception {

checkChildEntitySpec(app, entityName);
}

@Test(groups="WIP") //Not able to use caller provided catalog items when referencing entity specs (as opposed to catalog meta)
public void testYamlReferencingEarlierItemInUrlAsType() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
" itemType: entity",
" items:",
" - id: yaml.basic",
" version: " + TEST_VERSION,
" item:",
" type: org.apache.brooklyn.entity.stock.BasicApplication",
" - id: yaml.reference",
" version: " + TEST_VERSION,
" item:",
" type: classpath://yaml-ref-catalog.yaml"); // this references yaml.basic above

String entityName = "YAML -> catalog item -> yaml url";
Entity app = createAndStartApplication(
"services:",
"- name: " + entityName,
" type: " + ver("yaml.reference"));

checkChildEntitySpec(app, entityName);
}

private void checkChildEntitySpec(Entity app, String entityName) {
Collection<Entity> children = app.getChildren();
Assert.assertEquals(children.size(), 1);
Expand Down