Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CloudConfig editor: check / ca for NetworkName references

Browse Source
This commit is contained in:
Kris De Volder
2017-08-09 14:13:07 -07:00
parent c4377845c6
commit 0af54132c9
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCloudConfigSchema.java
View File

@@ -73,7 +73,9 @@ public class BoshCloudConfigSchema extends SchemaSupport implements YamlSchema {
models.astTypes.getDefinedNames(dc, t_vm_type_def)
));
t_network_def = f.yatomic("NetworkName").parseWith(ValueParsers.NE_STRING);
t_network_ref = t_ne_string;
t_network_ref = f.yenumFromDynamicValues("NetworkName", (dc) -> PartialCollection.compute(() ->
models.astTypes.getDefinedNames(dc, t_network_def)
));
t_ip_address = t_ne_string; //TODO? Syntax for ip addresses like 192.168.1.22 ?
t_ip_range = t_ne_string; //TODO? Syntax for ip ranges like 10.10.0.0/22 ?
t_ip_address_or_range = t_ne_string; //TODO?

40
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
View File

@@ -1951,7 +1951,8 @@ public class BoshEditorTest {
"not-int|NumberFormatException",
"not-bool|unknown 'boolean'",
"z1|unknown 'AZName'",
"default|unknown 'VMTypeName'"
"default|unknown 'VMTypeName'",
"private|unknown 'NetworkName'"
);
editor.assertHoverContains("workers", "The maximum number of compilation VMs");
editor.assertHoverContains("reuse_compilation_vms", "If `false`, BOSH creates a new compilation VM");
@@ -2038,8 +2039,7 @@ public class BoshEditorTest {
" workers: 5\n" +
" reuse_compilation_vms: true\n" +
" az: z1\n" +
" vm_type: medium\n" +
" network: private"
" vm_type: medium\n"
);
editor.ignoreProblem(YamlSchemaProblems.MISSING_PROPERTY);
editor.assertProblems(
@@ -2060,8 +2060,7 @@ public class BoshEditorTest {
" workers: 5\n" +
" reuse_compilation_vms: true\n" +
" az: z1\n" +
" vm_type: woot-vm\n" +
" network: private"
" vm_type: woot-vm\n"
);
editor.ignoreProblem(YamlSchemaProblems.MISSING_PROPERTY);
editor.assertProblems(
@@ -2328,4 +2327,35 @@ public class BoshEditorTest {
editor.assertHoverContains("cloud_properties", "Describes any IaaS-specific properties for the network");
}
@Test public void cloudconfig_network_ref() throws Exception {
Editor editor = harness.newEditor(LanguageId.BOSH_CLOUD_CONFIG,
"networks:\n" +
"- name: private\n" +
"- name: vip\n" +
"\n" +
"compilation:\n" +
" workers: 5\n" +
" reuse_compilation_vms: true\n" +
" az: z1\n" +
" vm_type: medium\n" +
" network: <*>"
);
editor.assertContextualCompletions("<*>", "private<*>", "vip<*>");
editor = harness.newEditor(LanguageId.BOSH_CLOUD_CONFIG,
"networks:\n" +
"- name: private\n" +
" type: manual\n" +
"- name: vip\n" +
" type: vip\n" +
"\n" +
"compilation:\n" +
" workers: 5\n" +
" reuse_compilation_vms: true\n" +
" network: bad-network"
);
editor.ignoreProblem(YamlSchemaProblems.MISSING_PROPERTY);
editor.assertProblems("bad-network|unknown 'NetworkName'");
}
}