From c4377845c68b54372da968e6641ae541558c90bc Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 9 Aug 2017 13:55:32 -0700 Subject: [PATCH] Schema for 'vip' network in Cloud conf editor --- .../VipNetwork/cloud_properties.md | 11 ++++++++ .../ide/vscode/bosh/BoshEditorTest.java | 27 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 headless-services/bosh-language-server/src/main/resources/cloud-config/VipNetwork/cloud_properties.md diff --git a/headless-services/bosh-language-server/src/main/resources/cloud-config/VipNetwork/cloud_properties.md b/headless-services/bosh-language-server/src/main/resources/cloud-config/VipNetwork/cloud_properties.md new file mode 100644 index 000000000..e6be69183 --- /dev/null +++ b/headless-services/bosh-language-server/src/main/resources/cloud-config/VipNetwork/cloud_properties.md @@ -0,0 +1,11 @@ +Describes any IaaS-specific properties for the network. Default is {} (empty Hash). + +See: + +- [AWS CPI network cloud properties](https://bosh.io/docs/aws-cpi.html#networks) +- [Azure CPI network cloud properties](https://bosh.io/docs/azure-cpi.html#networks) +- [OpenStack CPI network cloud properties](https://bosh.io/docs/openstack-cpi.html#networks) +- [Softlayer CPI network cloud properties](https://bosh.io/docs/softlayer-cpi.html#networks) +- [Google Cloud Platform CPI network cloud properties](https://bosh.io/docs/google-cpi.html#networks) +- [vSphere CPI network cloud properties](https://bosh.io/docs/vsphere-cpi.html#networks) +- [vCloud CPI network cloud properties](https://bosh.io/docs/vcloud-cpi.html#networks) \ No newline at end of file diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java index 6ac572d96..a6224dc68 100644 --- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java +++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java @@ -2301,4 +2301,31 @@ public class BoshEditorTest { editor.assertHoverContains("azs", "List of AZs associated with this subnet"); } + @Test public void cloudconfig_vip_network() throws Exception { + Editor editor; + + editor = harness.newEditor(LanguageId.BOSH_CLOUD_CONFIG, + "networks:\n" + + "- name: foo\n" + + " type: vip\n" + + " <*>" + ); + editor.assertContextualCompletions(PLAIN_COMPLETION, + "<*>" + , // ==> + "cloud_properties:\n" + + " <*>" + ); + + editor = harness.newEditor(LanguageId.BOSH_CLOUD_CONFIG, + "networks:\n" + + "- name: foo\n" + + " type: vip\n" + + " cloud_properties: {}" + ); + editor.assertHoverContains("name", "Name used to reference this network configuration"); + editor.assertHoverContains("type", "The type of configuration"); + editor.assertHoverContains("cloud_properties", "Describes any IaaS-specific properties for the network"); + } + }