diff --git a/.gitignore b/.gitignore index bb3d13bcf0..099e70b794 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ blobs .final_builds/jobs/**/*.tgz .final_builds/packages/**/*.tgz .bundle/ +.vscode/ *.swp *~ *# diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 6c8363432e..f6516f7faf 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -395,7 +395,7 @@ properties: cc.temporary_enable_v2: description: "Enable V2 endpoints" - default: true + default: false cc.directories.tmpdir: default: "/var/vcap/data/cloud_controller_ng/tmp" diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index 1882d269cd..1c8235d912 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -106,7 +106,7 @@ module Test 'name' => 'cflinuxfs4' }], 'staging_upload_password' => '((cc_staging_upload_password))', 'staging_upload_user' => 'staging_user', - 'temporary_enable_v2' => true }, + 'temporary_enable_v2' => false }, 'ccdb' => { 'databases' => [{ 'name' => 'cloud_controller', 'tag' => 'cc' }], 'db_scheme' => 'mysql', @@ -503,19 +503,19 @@ module Test end describe 'enable v2 API' do - it 'is by default true' do + it 'is by default false' do template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - expect(template_hash['temporary_enable_v2']).to be(true) + expect(template_hash['temporary_enable_v2']).to be(false) end - context 'when explicitly disabled' do + context 'when explicitly enabled' do before do - merged_manifest_properties['cc']['temporary_enable_v2'] = false + merged_manifest_properties['cc']['temporary_enable_v2'] = true end - it 'is false' do + it 'is true' do template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - expect(template_hash['temporary_enable_v2']).to be(false) + expect(template_hash['temporary_enable_v2']).to be(true) end end end diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index ce1a0fb559..6744690b43 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -81,7 +81,7 @@ module Test 'enable_dynamic_job_priorities' => false }, 'app_log_revision' => true, - 'temporary_enable_v2' => true, + 'temporary_enable_v2' => false, 'packages' => { 'max_valid_packages_stored' => 5 } @@ -267,7 +267,7 @@ module Test describe 'enable v2 API' do it 'is by default true' do template_hash = YAML.safe_load(template.render(manifest_properties, consumes: links)) - expect(template_hash['temporary_enable_v2']).to be(true) + expect(template_hash['temporary_enable_v2']).to be(false) end end