bosh-cloudfoundry 0.7.0.alpha.3 → 0.7.0.alpha.4

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

@@ -0,0 +1,350 @@
+---
+name: demo
+director_uuid: UUID
+
+releases:
+ - name: cf-release
+   version: 132
+
+networks:
+- name: floating
+  type: vip
+  cloud_properties: {}
+- name: default
+  type: dynamic
+  cloud_properties:
+    security_groups:
+    - default
+
+update:
+  canaries: 1
+  canary_watch_time: 30000-600000
+  update_watch_time: 30000-600000
+  max_in_flight: 4
+  max_errors: 1
+
+compilation:
+  workers: 6
+  network: default
+  reuse_compilation_vms: true
+  cloud_properties:
+    instance_type: m1.medium
+
+resource_pools:
+  - name: small
+    network: default
+    size: 2
+    stemcell:
+      name: bosh-stemcell
+      version: latest
+    cloud_properties:
+      instance_type: m1.small
+
+  - name: medium
+    network: default
+    size: 2
+    stemcell:
+      name: bosh-stemcell
+      version: latest
+    cloud_properties:
+      instance_type: m1.medium
+
+jobs:
+  - name: core
+    release: cf-release
+    template:
+      - syslog_aggregator
+      - nats
+      - postgres
+      - health_manager_next
+      - collector
+      - debian_nfs_server
+      - login
+    instances: 1
+    resource_pool: medium
+    persistent_disk: 4096
+    networks:
+    - name: default
+      default:
+      - dns
+      - gateway
+    properties:
+      db: databases
+
+  # need a separate job for uaa due to https://github.com/cloudfoundry/cf-release/issues/104
+  - name: uaa
+    release: cf-release
+    template:
+      - uaa
+    instances: 1
+    resource_pool: small
+    networks:
+      - name: default
+        default: [dns, gateway]
+
+  - name: api
+    release: cf-release
+    template:
+      - cloud_controller_ng
+      - gorouter
+    instances: 1
+    resource_pool: medium
+    networks:
+    - name: default
+      default:
+      - dns
+      - gateway
+    - name: floating
+      static_ips:
+      - 1.2.3.4
+    properties:
+      db: databases
+
+  - name: dea
+    release: cf-release
+    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
+
+  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
+    max_memory: 4096
+    memory_mb: 4084
+    memory_overcommit_factor: 4
+    disk_mb: 4096
+    disk_overcommit_factor: 4
+
+  dea_next: *dea
+
+  service_lifecycle:
+    serialization_data_server:
+    - 0.core.default.demo.microbosh
+
+  syslog_aggregator:
+    address: 0.core.default.demo.microbosh
+    port: 54321
+
+  serialization_data_server:
+    port: 8080
+    logging_level: debug
+    upload_token: qwertyasdfgh
+    upload_timeout: 10
+
+  collector:
+    deployment_name: cf
+    use_tsdb: false
+    use_aws_cloudwatch: false
+    use_datadog: false
+
+  nfs_server:
+    address: 0.core.default.demo.microbosh
+    #network: "*.demo.microbosh"
+    #idmapd_domain: mycloud.com
+
+  debian_nfs_server:
+    no_root_squash: true
+
+  databases: &databases
+    db_scheme: postgres
+    address: 0.core.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.core.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.core.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: "b963127302433579"
+    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
+
+  ccng: *cc
+
+  login:
+    protocol: http
+    links:
+      home: http://console.mycloud.com
+      passwd: http://console.mycloud.com/password_resets/new
+      signup: http://console.mycloud.com/register
+
+  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
+        - my
+        - micro
+        - support-signon
+        - login
+    clients:
+      login:
+        override: true
+        scope: openid
+        authorities: oauth.login
+        secret: qwertyasdfgh
+        authorized-grant-types: authorization_code,client_credentials,refresh_token
+        redirect-uri: http://login.mycloud.com
+      support-services:
+        scope: scim.write,scim.read,openid,cloud_controller.read,cloud_controller.write
+        secret: qwertyasdfgh
+        authorized-grant-types: authorization_code,client_credentials
+        redirect-uri: http://support-signon.mycloud.com
+        authorities: portal.users.read
+        access-token-validity: 1209600
+        refresh-token-validity: 1209600
+      oauth2service:
+        secret: qwertyasdfgh
+        scope: openid,cloud_controller.read,cloud_controller.write
+        authorities: uaa.resource,oauth.service,clients.read,clients.write,clients.secret
+        authorized-grant-types: client_credentials,implicit
+        redirect-uri: http://rewritten-later.cloudfoundry.com/whatever
+        override: true
+        autoapprove: true
+      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
+      servicesmgmt:
+        override: true
+        secret: qwertyasdfgh
+        scope: openid,cloud_controller.read,cloud_controller.write
+        authorities: uaa.resource,oauth.service,clients.read,clients.write,clients.secret
+        authorized-grant-types: authorization_code,client_credentials,password,implicit
+        redirect-uri: http://servicesmgmt.mycloud.com/auth/cloudfoundry/callback
+        autoapprove: true
+    scim:
+      users:
+      - admin|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin
+      - services|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin

data/spec/deployment_file_spec.rb

@@ -0,0 +1,92 @@
+describe Bosh::Cloudfoundry::DeploymentFile do
+
+  def initial_deployment_file(properties = {})
+    FileUtils.mkdir_p(home_file("deployments/cf"))
+    file = home_file("deployments/cf/demo.yml")
+    File.open(file, "w") do |f|
+      f << {
+        "name" => "demo",
+        "releases" => [
+          {"name" => "cf-release", "version" => 132}
+        ],
+        "properties" => {
+          "cf" => properties.merge({
+            "dns" => "mycloud.com",
+            "ip_addresses" => ['1.2.3.4'],
+            "deployment_size" => "medium",
+            "security_group" => "cf",
+            "persistent_disk" => 4096,
+            "common_passwords" => "qwerty"
+          })
+        }
+      }.to_yaml
+    end
+    file
+  end
+
+  it "can reconstruct DeploymentFile from even minimal deployment file" do
+    file = initial_deployment_file
+    deployment_file = Bosh::Cloudfoundry::DeploymentFile.reconstruct_from_deployment_file(
+      file, mock("director"), {"cpi" => "openstack"})
+
+    # simple tests to check the values all went into the right places
+    deployment_file.deployment_size.should == "medium"
+    deployment_file.deployment_attributes.dns.should == "mycloud.com"
+    deployment_file.bosh_cpi.should == "openstack"
+    deployment_file.release_version_number.should == 132
+  end
+
+  context "generates deployment (aws)" do
+    let(:bosh_cpi) { "aws" }
+    let(:bosh_status) { {"cpi" => bosh_cpi, "uuid" => "UUID"} }
+    let(:release_version_cpi) { Bosh::Cloudfoundry::ReleaseVersionCpi.latest_for_cpi(bosh_cpi) }
+    let(:release_version_cpi_medium) { Bosh::Cloudfoundry::ReleaseVersionCpiSize.new(release_version_cpi, "medium") }
+    let(:deployment_attributes) do
+      Bosh::Cloudfoundry::DeploymentAttributes.new(mock("director"), bosh_status, release_version_cpi_medium, {
+        name: "demo",
+        dns: "mycloud.com",
+        ip_addresses: ['1.2.3.4']
+      })
+    end
+
+    subject { Bosh::Cloudfoundry::DeploymentFile.new(release_version_cpi_medium, 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 "medium size" do
+      in_home_dir do
+        file = home_file("deployments/cf/demo.yml")
+        subject.prepare_environment
+        subject.create_deployment_file
+        subject.deploy(non_interactive: true)
+        manifest = YAML.load_file(file)
+      end
+    end
+  # 
+  # it "generates a large deployment" do
+  #   in_home_dir do
+  #     command.add_option(:deployment_size, "large")
+  # 
+  #     command.create_cf
+  #     files_match(spec_asset("v132/aws/large.yml"), command.deployment_file)
+  # 
+  #     manifest = YAML.load_file(command.deployment_file)
+  #     Bosh::Cli::DeploymentManifest.new(manifest).normalize
+  #   end
+  # end
+  # 
+  # it "specifies core size" do
+  #   in_home_dir do
+  #     command.add_option(:size, "xlarge")
+  #     command.create_cf
+  #   end
+  # end
+
+  end
+end

data/spec/plugin_spec.rb

@@ -1,4 +1,5 @@
 require "bosh/cli/commands/cf"
+require "fakeweb"
 
 describe Bosh::Cli::Command::CloudFoundry do
   include FileUtils
@@ -11,6 +12,7 @@ describe Bosh::Cli::Command::CloudFoundry do
   end
 
   before { setup_home_dir }
+  before { FakeWeb.allow_net_connect = false }
 
   it "shows help" do
     subject.cf_help
@@ -53,12 +55,13 @@ describe Bosh::Cli::Command::CloudFoundry do
     end
 
     context "with requirements" do
-      before do
+      it "creates cf deployment" do
         command.add_option(:config, home_file(".bosh_config"))
         command.add_option(:non_interactive, true)
         command.add_option(:name, "demo")
         command.add_option(:ip, ["1.2.3.4"])
         command.add_option(:dns, "mycloud.com")
+        command.add_option(:common_password, "qwertyasdfgh")
 
         command.should_receive(:auth_required)
 
@@ -67,60 +70,42 @@ describe Bosh::Cli::Command::CloudFoundry do
         command.stub(:director_client).and_return(director)
 
         command.stub(:deployment).and_return(home_file("deployments/cf/demo.yml"))
-        command.biff.stub(:deployment).and_return(home_file("deployments/cf/demo.yml"))
 
-        deployment_cmd = mock("deployment_cmd")
-        deployment_cmd.should_receive(:set_current).with(home_file("deployments/cf/demo.yml"))
-        deployment_cmd.stub(:perform)
-        command.stub(:deployment_cmd).and_return(deployment_cmd)
-      end
-
-      it "generates a deployment file" do
-        in_home_dir do
-          File.should_not be_exist(command.deployment_file)
-          command.create_cf
-          File.should be_exist(command.deployment_file)
-        end
-      end
+        deployment_file = mock("deployment_file")
+        Bosh::Cloudfoundry::DeploymentFile.should_receive(:new).
+          and_return(deployment_file)
+        deployment_file.should_receive(:prepare_environment)
+        deployment_file.should_receive(:create_deployment_file)
+        deployment_file.should_receive(:deploy)
 
-      it "generates deployment file with required keys" do
-        in_home_dir do
-          command.create_cf
-          manifest = YAML.load_file(command.deployment_file)
-          required_deployment_keys = %w[name director_uuid releases compilation update resource_pools jobs properties]
-          required_deployment_keys.each do |required_key|
-            manifest[required_key].should_not be_nil
-          end
-        end
+        command.create_cf
       end
 
-      it "generate deployment file that can be normalized" do
-        in_home_dir do
-          command.create_cf
-          manifest = YAML.load_file(command.deployment_file)
-          # invokes #err if any errors found
-          Bosh::Cli::DeploymentManifest.new(manifest).normalize
-        end
-      end
+    end
 
-      it "specifies core size" do
-        in_home_dir do
-          command.add_option(:size, "xlarge")
-          command.create_cf
-        end
-      end
+    it "displays the list of internal passwords" do
+      command.add_option(:config, home_file(".bosh_config"))
+      command.add_option(:non_interactive, true)
 
-      context "and show passwords" do
-        it "displays the list of internal passwords" do
-          in_home_dir do
-            command.create_cf
-            command.show_cf_passwords
-          end
-        end
+      director = mock("director_client")
+      director.should_receive(:get_status).and_return({"uuid" => "UUID", "cpi" => "aws"})
+      command.stub(:director_client).and_return(director)
+
+      command.stub(:deployment).and_return(home_file("deployment.yml"))
+      File.open(home_file("deployment.yml"), "w") do |f|
+        f << {
+          "releases" => [
+            {"name" => "cf-release", "version" => 132}
+          ],
+          "properties" => {
+            "cf" => {
+              "common_passwords" => "qwerty"
+            }
+          }
+        }.to_yaml
       end
-
+      command.show_cf_passwords
     end
-
   end
 
 end