bosh-cloudfoundry 0.7.0 → 0.7.1

data/spec/assets/v141/aws/medium.yml

@@ -0,0 +1,293 @@
+---
+name: demo
+director_uuid: UUID
+
+releases:
+ - name: cf
+   version: 141
+
+networks:
+- name: floating
+  type: vip
+  cloud_properties: {}
+- name: default
+  type: dynamic
+  cloud_properties:
+    security_groups:
+    - default
+
+update:
+  canaries: 1
+  canary_watch_time: 30000-60000
+  update_watch_time: 30000-60000
+  max_in_flight: 4
+
+compilation:
+  workers: 6
+  network: default
+  reuse_compilation_vms: true
+  cloud_properties:
+    instance_type: m1.medium
+
+resource_pools:
+  - name: small
+    network: default
+    size: 4
+    stemcell:
+      name: bosh-stemcell
+      version: latest
+    cloud_properties:
+      instance_type: m1.small
+
+  - name: medium
+    network: default
+    size: 0
+    stemcell:
+      name: bosh-stemcell
+      version: latest
+    cloud_properties:
+      instance_type: m1.medium
+
+jobs:
+  - name: data
+    release: cf
+    template:
+      - postgres
+      - debian_nfs_server
+    instances: 1
+    resource_pool: small
+    persistent_disk: 4096
+    networks:
+    - name: default
+      default:
+      - dns
+      - gateway
+    properties:
+      db: databases
+
+  - name: core
+    release: cf
+    template:
+      - nats
+      - health_manager_next
+      - uaa
+    instances: 1
+    resource_pool: small
+    networks:
+    - name: default
+      default:
+      - dns
+      - gateway
+
+  - name: api
+    release: cf
+    template:
+      - cloud_controller_ng
+      - gorouter
+    instances: 1
+    resource_pool: small
+    networks:
+    - name: default
+      default:
+      - dns
+      - gateway
+    - name: floating
+      static_ips:
+      - 1.2.3.4
+    properties:
+      db: databases
+
+  - name: dea
+    release: cf
+    template:
+      - dea_next
+    instances: 1
+    resource_pool: small
+    networks:
+      - name: default
+        default: [dns, gateway]
+
+properties:
+  cf:
+    name: demo
+    dns: mycloud.com
+    ip_addresses: ["1.2.3.4"]
+    deployment_size: medium
+    security_group: default
+    persistent_disk: 4096
+    common_password: qwertyasdfgh
+    dea_server_ram: 1500
+    dea_container_depot_disk: 10240
+
+  domain: mycloud.com
+  system_domain: mycloud.com.com
+  system_domain_organization: system_domain
+  app_domains:
+    - mycloud.com
+
+  networks:
+    apps: default
+    management: default
+
+  nats:
+    address: 0.core.default.demo.microbosh
+    port: 4222
+    user: nats
+    password: qwertyasdfgh
+    authorization_timeout: 5
+
+  router:
+    port: 8081
+    status:
+      port: 8080
+      user: gorouter
+      password: qwertyasdfgh
+
+  dea: &dea
+    memory_mb: 1500
+    disk_mb: 10240
+    directory_server_protocol: http
+
+  dea_next: *dea
+
+  syslog_aggregator:
+    address: 0.syslog-aggregator.default.demo.microbosh
+    port: 54321
+
+  nfs_server:
+    address: 0.data.default.demo.microbosh
+    network: "*.demo.microbosh"
+    idmapd_domain: mycloud.com
+
+  debian_nfs_server:
+    no_root_squash: true
+
+  databases: &databases
+    db_scheme: postgres
+    address: 0.data.default.demo.microbosh
+    port: 5524
+    roles:
+      - tag: admin
+        name: ccadmin
+        password: qwertyasdfgh
+      - tag: admin
+        name: uaaadmin
+        password: qwertyasdfgh
+    databases:
+      - tag: cc
+        name: ccdb
+        citext: true
+      - tag: uaa
+        name: uaadb
+        citext: true
+
+  ccdb: &ccdb
+    db_scheme: postgres
+    address: 0.data.default.demo.microbosh
+    port: 5524
+    roles:
+      - tag: admin
+        name: ccadmin
+        password: qwertyasdfgh
+    databases:
+      - tag: cc
+        name: ccdb
+        citext: true
+
+  ccdb_ng: *ccdb
+
+  uaadb: 
+    db_scheme: postgresql
+    address: 0.data.default.demo.microbosh
+    port: 5524
+    roles:
+      - tag: admin
+        name: uaaadmin
+        password: qwertyasdfgh
+    databases:
+      - tag: uaa
+        name: uaadb
+        citext: true
+
+  cc_api_version: v2
+
+  cc: &cc
+    logging_level: debug
+    external_host: ccng
+    srv_api_uri: http://api.mycloud.com
+    cc_partition: default
+    db_encryption_key: qwertyasdfgh
+    bootstrap_admin_email: admin@mycloud.com
+    bulk_api_password: qwertyasdfgh
+    uaa_resource_id: cloud_controller
+    staging_upload_user: uploaduser
+    staging_upload_password: qwertyasdfgh
+    resource_pool:
+      resource_directory_key: cc-resources
+      # Local provider when using NFS
+      fog_connection:
+        provider: Local
+        local_root: /var/vcap/shared
+    packages:
+      app_package_directory_key: cc-packages
+    droplets:
+      droplet_directory_key: cc-droplets
+    default_quota_definition: runaway
+
+  ccng: *cc
+
+  login:
+    enabled: false
+
+  uaa:
+    url: http://uaa.mycloud.com
+    spring_profiles: postgresql
+    no_ssl: true
+    catalina_opts: -Xmx768m -XX:MaxPermSize=256m
+    resource_id: account_manager
+    jwt:
+      signing_key: |
+        -----BEGIN RSA PRIVATE KEY-----
+        MIICXAIBAAKBgQDHFr+KICms+tuT1OXJwhCUmR2dKVy7psa8xzElSyzqx7oJyfJ1
+        JZyOzToj9T5SfTIq396agbHJWVfYphNahvZ/7uMXqHxf+ZH9BL1gk9Y6kCnbM5R6
+        0gfwjyW1/dQPjOzn9N394zd2FJoFHwdq9Qs0wBugspULZVNRxq7veq/fzwIDAQAB
+        AoGBAJ8dRTQFhIllbHx4GLbpTQsWXJ6w4hZvskJKCLM/o8R4n+0W45pQ1xEiYKdA
+        Z/DRcnjltylRImBD8XuLL8iYOQSZXNMb1h3g5/UGbUXLmCgQLOUUlnYt34QOQm+0
+        KvUqfMSFBbKMsYBAoQmNdTHBaz3dZa8ON9hh/f5TT8u0OWNRAkEA5opzsIXv+52J
+        duc1VGyX3SwlxiE2dStW8wZqGiuLH142n6MKnkLU4ctNLiclw6BZePXFZYIK+AkE
+        xQ+k16je5QJBAN0TIKMPWIbbHVr5rkdUqOyezlFFWYOwnMmw/BKa1d3zp54VP/P8
+        +5aQ2d4sMoKEOfdWH7UqMe3FszfYFvSu5KMCQFMYeFaaEEP7Jn8rGzfQ5HQd44ek
+        lQJqmq6CE2BXbY/i34FuvPcKU70HEEygY6Y9d8J3o6zQ0K9SYNu+pcXt4lkCQA3h
+        jJQQe5uEGJTExqed7jllQ0khFJzLMx0K6tj0NeeIzAaGCQz13oo2sCdeGRHO4aDh
+        HH6Qlq/6UOV5wP8+GAcCQFgRCcB+hrje8hfEEefHcFpyKH+5g1Eu1k0mLrxK2zd+
+        4SlotYRHgPCEubokb2S1zfZDWIXW3HmggnGgM949TlY=
+        -----END RSA PRIVATE KEY-----
+      verification_key: |
+        -----BEGIN PUBLIC KEY-----
+        MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHFr+KICms+tuT1OXJwhCUmR2d
+        KVy7psa8xzElSyzqx7oJyfJ1JZyOzToj9T5SfTIq396agbHJWVfYphNahvZ/7uMX
+        qHxf+ZH9BL1gk9Y6kCnbM5R60gfwjyW1/dQPjOzn9N394zd2FJoFHwdq9Qs0wBug
+        spULZVNRxq7veq/fzwIDAQAB
+        -----END PUBLIC KEY-----
+    cc:
+      client_secret: qwertyasdfgh
+    admin:
+      client_secret: qwertyasdfgh
+    batch:
+      username: batchuser
+      password: qwertyasdfgh
+    client:
+      autoapprove:
+        - cf
+    clients:
+      cf:
+        override: true
+        authorized-grant-types: password,implicit,refresh_token
+        authorities: uaa.none
+        scope: cloud_controller.read,cloud_controller.write,openid,password.write,cloud_controller.admin,scim.read,scim.write
+        access-token-validity: 7200
+        refresh-token-validity: 1209600
+    scim:
+      users:
+      - admin|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin
+      - services|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin

data/spec/commands/command_prepare_cf_spec.rb

@@ -1,11 +1,9 @@
 require "bosh/cli/commands/01_prepare_bosh_for_cf"
 
 describe Bosh::Cli::Command::PrepareBoshForCloudFoundry do
-  let(:latest_release_version_number) { 134 }
-
   let(:command) { Bosh::Cli::Command::PrepareBoshForCloudFoundry.new }
   let(:director) { instance_double("Bosh::Cli::Director") }
-  let(:aws_full_stemcell_url)  { "http://bosh-jenkins-artifacts.s3.amazonaws.com/bosh-stemcell/aws/latest-bosh-stemcell-aws.tgz" }
+  let(:aws_full_stemcell_url)  { "http://bosh-jenkins-artifacts.s3.amazonaws.com/bosh-stemcell/aws/bosh-stemcell-latest-aws-xen-ubuntu.tgz" }
 
   before do
     setup_home_dir
@@ -25,7 +23,7 @@ describe Bosh::Cli::Command::PrepareBoshForCloudFoundry do
       director.should_receive(:list_releases).and_return([])
       director.should_receive(:list_stemcells).and_return([])
 
-      release_yml = File.expand_path("../../../bosh_release/releases/cf-release-#{latest_release_version_number}.yml", __FILE__)
+      release_yml = File.expand_path("../../../bosh_release/releases/cf-#{latest_cf_release_version}.yml", __FILE__)
       release_cmd = instance_double("Bosh::Cli::Command::Release")
       release_cmd.should_receive(:upload).with(release_yml)
       command.stub(:release_cmd).and_return(release_cmd)
@@ -96,7 +94,7 @@ describe Bosh::Cli::Command::PrepareBoshForCloudFoundry do
       director.should_receive(:list_releases).and_return([])
       director.should_receive(:list_stemcells).and_return([{"name" => "bosh-stemcell", "version" => "something"}])
       
-      release_yml = File.expand_path("../../../bosh_release/releases/cf-release-#{latest_release_version_number}.yml", __FILE__)
+      release_yml = File.expand_path("../../../bosh_release/releases/cf-#{latest_cf_release_version}.yml", __FILE__)
       release_cmd = instance_double("Bosh::Cli::Command::Release")
       release_cmd.should_receive(:upload).with(release_yml)
       command.stub(:release_cmd).and_return(release_cmd)

data/spec/deployment_attributes_spec.rb

@@ -11,6 +11,8 @@ describe Bosh::Cloudfoundry::DeploymentAttributes do
     it { subject.persistent_disk.should == 4096 }
     it { subject.security_group.should == "default" }
     it { subject.common_password.should == "qwertyqwerty" }
+    it { subject.dea_server_ram.should == 1500 }
+    it { subject.dea_container_depot_disk.should == 10240 }
   end
 
   context "delayed default values" do
@@ -35,7 +37,7 @@ describe Bosh::Cloudfoundry::DeploymentAttributes do
     it "returns default attributes" do
       subject = Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi)
       subject.available_attributes.sort.should ==
-        %w[common_password deployment_size name persistent_disk security_group].map(&:to_sym)
+        %w[common_password dea_container_depot_disk dea_server_ram deployment_size name persistent_disk security_group skip_dns_validation].map(&:to_sym)
     end
 
     it "returns additional attributes" do
@@ -43,7 +45,7 @@ describe Bosh::Cloudfoundry::DeploymentAttributes do
         dns: "mycloud.com", ip_addresses: ["1.2.3.4"]
       })
       subject.available_attributes.sort.should ==
-        %w[common_password deployment_size dns ip_addresses name persistent_disk security_group].map(&:to_sym)
+        %w[common_password dea_container_depot_disk dea_server_ram deployment_size dns ip_addresses name persistent_disk security_group skip_dns_validation].map(&:to_sym)
     end
 
     # immutable_attributes ultimately determined by ReleaseVersion (from templates/vXYZ/spec)
@@ -57,7 +59,7 @@ describe Bosh::Cloudfoundry::DeploymentAttributes do
     end
 
     context "mutable attributes" do
-      let(:mutable_attributes) { %w[ip_addresses persistent_disk security_group].map(&:to_sym) }
+      let(:mutable_attributes) { %w[dea_server_ram ip_addresses persistent_disk security_group].map(&:to_sym) }
       before { release_version_cpi.should_receive(:mutable_attributes).and_return(mutable_attributes) }
 
       subject do
@@ -80,4 +82,4 @@ describe Bosh::Cloudfoundry::DeploymentAttributes do
       end
     end
   end
-end
+end

data/spec/deployment_file_spec.rb

@@ -50,30 +50,32 @@ describe Bosh::Cloudfoundry::DeploymentFile do
         common_password: "qwertyasdfgh",
         deployment_size: deployment_size
       } }
-      let(:release_version_cpi) { Bosh::Cloudfoundry::ReleaseVersionCpi.for_cpi(133, bosh_cpi) }
-      let(:release_version_cpi_size) { Bosh::Cloudfoundry::ReleaseVersionCpiSize.new(release_version_cpi, deployment_size) }
-      let(:deployment_attributes) do
-        Bosh::Cloudfoundry::DeploymentAttributes.new(mock("director"), bosh_status, release_version_cpi_size, attributes)
-      end
+      # [133, 141].each do |release_version|
+      [141].each do |release_version|
+        let(:release_version_cpi) { Bosh::Cloudfoundry::ReleaseVersionCpi.for_cpi(release_version, bosh_cpi) }
+        let(:release_version_cpi_size) { Bosh::Cloudfoundry::ReleaseVersionCpiSize.new(release_version_cpi, deployment_size) }
+        let(:deployment_attributes) do
+          Bosh::Cloudfoundry::DeploymentAttributes.new(mock("director"), bosh_status, release_version_cpi_size, attributes)
+        end
 
-      subject { Bosh::Cloudfoundry::DeploymentFile.new(release_version_cpi_size, deployment_attributes, bosh_status) }
+        subject { Bosh::Cloudfoundry::DeploymentFile.new(release_version_cpi_size, deployment_attributes, bosh_status) }
 
-      before do
-        subject.biff.stub(:deployment).and_return(home_file("deployments/cf/demo.yml"))
-        deployment_cmd = mock("deployment_cmd")
-        deployment_cmd.stub(:set_current).with(home_file("deployments/cf/demo.yml"))
-        deployment_cmd.stub(:perform)
-        subject.stub(:deployment_cmd).and_return(deployment_cmd)
-      end
-
-      it "#{deployment_size} size" do
-        in_home_dir do
-          subject.prepare_environment
+        before do
+          subject.biff.stub(:deployment).and_return(home_file("deployments/cf/demo.yml"))
+          deployment_cmd = mock("deployment_cmd")
+          deployment_cmd.stub(:set_current).with(home_file("deployments/cf/demo.yml"))
+          deployment_cmd.stub(:perform)
+          subject.stub(:deployment_cmd).and_return(deployment_cmd)
+        end
 
-          subject.create_deployment_file
-          files_match(spec_asset("v133/aws/#{deployment_size}.yml"), subject.deployment_file)
+        it "#{deployment_size} size for v#{release_version}" do
+          in_home_dir do
+            subject.prepare_environment
+            subject.create_deployment_file
+            files_match(spec_asset("v#{release_version}/aws/#{deployment_size}.yml"), subject.deployment_file)
 
-          subject.deploy(non_interactive: true)
+            subject.deploy(non_interactive: true)
+          end
         end
       end
     end

data/spec/release_version_cpi_spec.rb

@@ -1,7 +1,5 @@
 describe Bosh::Cloudfoundry::ReleaseVersionCpi do
-  let(:latest_release_version_number) { 134 }
-
-  subject { Bosh::Cloudfoundry::ReleaseVersionCpi.for_cpi(133, "aws") }
+  subject { Bosh::Cloudfoundry::ReleaseVersionCpi.for_cpi(latest_cf_release_version, "aws") }
 
   it "has available deployment sizes" do
     subject.available_deployment_sizes.should == %w[medium large]
@@ -14,6 +12,6 @@ describe Bosh::Cloudfoundry::ReleaseVersionCpi do
   it "latest_for_cpi(bosh_cpi)" do
     rvc = Bosh::Cloudfoundry::ReleaseVersionCpi.latest_for_cpi("aws")
     rvc.cpi.should == "aws"
-    rvc.release_version_number.should == latest_release_version_number
+    rvc.release_version_number.should == latest_cf_release_version
   end
 end

data/spec/release_version_spec.rb

@@ -1,6 +1,4 @@
 describe Bosh::Cloudfoundry::ReleaseVersion do
-  let(:latest_release_version_number) { 134 }
-
   it "cannot accept versions lower than 132" do
     expect { Bosh::Cloudfoundry::ReleaseVersion.for_version(131) }.to raise_error(RuntimeError)
   end
@@ -10,15 +8,15 @@ describe Bosh::Cloudfoundry::ReleaseVersion do
   end
 
   it "finds an next available version match" do
-    Bosh::Cloudfoundry::ReleaseVersion.for_version(200).version_number.should == latest_release_version_number
+    Bosh::Cloudfoundry::ReleaseVersion.for_version(200).version_number.should == latest_cf_release_version
   end
 
   it "knows available versions" do
-    Bosh::Cloudfoundry::ReleaseVersion.available_versions.should == [132, 133, 134]
+    Bosh::Cloudfoundry::ReleaseVersion.available_versions.should == [132, 133, 134, 136, 141]
   end
 
   it "knows latest version number" do
-    Bosh::Cloudfoundry::ReleaseVersion.latest_version_number.should == latest_release_version_number
+    Bosh::Cloudfoundry::ReleaseVersion.latest_version_number.should == latest_cf_release_version
   end
 
   context "for v132" do