bosh-director 1.3160.0 → 1.3163.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/bosh-director-worker +2 -14
- data/db/migrations/director/20150513225143_ip_addresses.rb +11 -0
- data/db/migrations/director/20150702004608_add_links.rb +8 -0
- data/db/migrations/director/20150708231924_add_link_spec.rb +7 -0
- data/db/migrations/director/20150724183256_add_debugging_to_ip_addresses.rb +8 -0
- data/db/migrations/director/20150730225029_add_uuid_to_instances.rb +16 -0
- data/db/migrations/director/20150803215805_add_availabililty_zone_and_cloud_properties_to_instances.rb +8 -0
- data/db/migrations/director/20150804211419_add_compilation_flag_to_instance.rb +7 -0
- data/db/migrations/director/20150918003455_add_bootstrap_node_to_instance.rb +7 -0
- data/db/migrations/director/20151008232214_add_dns_records.rb +7 -0
- data/db/migrations/director/20151015172551_add_orphan_disks_and_snapshots.rb +29 -0
- data/db/migrations/director/20151030222853_add_templates_to_instance.rb +10 -0
- data/db/migrations/director/20151031001039_add_spec_to_instance.rb +19 -0
- data/db/migrations/director/20151109190602_rename_orphan_columns.rb +13 -0
- data/lib/bosh/director.rb +19 -9
- data/lib/bosh/director/agent_client.rb +0 -17
- data/lib/bosh/director/api/cloud_config_manager.rb +7 -5
- data/lib/bosh/director/api/controllers/base_controller.rb +3 -2
- data/lib/bosh/director/api/controllers/cleanup_controller.rb +15 -0
- data/lib/bosh/director/api/controllers/deployments_controller.rb +38 -26
- data/lib/bosh/director/api/controllers/disks_controller.rb +20 -0
- data/lib/bosh/director/api/controllers/info_controller.rb +2 -2
- data/lib/bosh/director/api/controllers/releases_controller.rb +1 -16
- data/lib/bosh/director/api/controllers/stemcells_controller.rb +1 -9
- data/lib/bosh/director/api/deployment_manager.rb +2 -1
- data/lib/bosh/director/api/instance_lookup.rb +17 -0
- data/lib/bosh/director/api/instance_manager.rb +20 -10
- data/lib/bosh/director/api/release_manager.rb +28 -8
- data/lib/bosh/director/api/resurrector_manager.rb +9 -2
- data/lib/bosh/director/api/route_configuration.rb +2 -0
- data/lib/bosh/director/api/snapshot_manager.rb +9 -5
- data/lib/bosh/director/api/stemcell_manager.rb +50 -0
- data/lib/bosh/director/app.rb +1 -1
- data/lib/bosh/director/cloudcheck_helper.rb +119 -132
- data/lib/bosh/director/compile_task.rb +1 -1
- data/lib/bosh/director/compile_task_generator.rb +2 -2
- data/lib/bosh/director/config.rb +21 -12
- data/lib/bosh/director/deployment_deleter.rb +69 -0
- data/lib/bosh/director/deployment_plan.rb +35 -4
- data/lib/bosh/director/deployment_plan/agent_state_migrator.rb +47 -0
- data/lib/bosh/director/deployment_plan/assembler.rb +115 -241
- data/lib/bosh/director/deployment_plan/availability_zone.rb +27 -0
- data/lib/bosh/director/deployment_plan/cloud_manifest_parser.rb +144 -35
- data/lib/bosh/director/deployment_plan/compilation_config.rb +21 -19
- data/lib/bosh/director/deployment_plan/compilation_instance_pool.rb +169 -0
- data/lib/bosh/director/deployment_plan/deployment_repo.rb +4 -8
- data/lib/bosh/director/deployment_plan/deployment_spec_parser.rb +13 -1
- data/lib/bosh/director/deployment_plan/deployment_validator.rb +17 -0
- data/lib/bosh/director/deployment_plan/desired_instance.rb +15 -0
- data/lib/bosh/director/deployment_plan/{disk_pool.rb → disk_type.rb} +14 -19
- data/lib/bosh/director/deployment_plan/dynamic_network.rb +105 -53
- data/lib/bosh/director/deployment_plan/dynamic_network_subnet.rb +13 -0
- data/lib/bosh/director/deployment_plan/env.rb +18 -0
- data/lib/bosh/director/deployment_plan/global_network_resolver.rb +77 -0
- data/lib/bosh/director/deployment_plan/instance.rb +222 -390
- data/lib/bosh/director/deployment_plan/instance_network_reservations.rb +71 -0
- data/lib/bosh/director/deployment_plan/instance_plan.rb +336 -0
- data/lib/bosh/director/deployment_plan/instance_plan_factory.rb +54 -0
- data/lib/bosh/director/deployment_plan/instance_plan_sorter.rb +61 -0
- data/lib/bosh/director/deployment_plan/instance_planner.rb +101 -0
- data/lib/bosh/director/deployment_plan/instance_repository.rb +36 -0
- data/lib/bosh/director/deployment_plan/instance_spec.rb +154 -0
- data/lib/bosh/director/deployment_plan/ip_provider/database_ip_repo.rb +136 -0
- data/lib/bosh/director/deployment_plan/ip_provider/in_memory_ip_repo.rb +81 -0
- data/lib/bosh/director/deployment_plan/ip_provider/ip_provider.rb +153 -0
- data/lib/bosh/director/deployment_plan/ip_provider/ip_provider_factory.rb +22 -0
- data/lib/bosh/director/deployment_plan/job.rb +116 -53
- data/lib/bosh/director/deployment_plan/job_availability_zone_parser.rb +49 -0
- data/lib/bosh/director/deployment_plan/job_migrator.rb +90 -0
- data/lib/bosh/director/deployment_plan/job_network.rb +42 -0
- data/lib/bosh/director/deployment_plan/job_network_parser.rb +118 -0
- data/lib/bosh/director/deployment_plan/job_spec_parser.rb +123 -126
- data/lib/bosh/director/deployment_plan/links/link.rb +30 -0
- data/lib/bosh/director/deployment_plan/links/link_lookup.rb +66 -0
- data/lib/bosh/director/deployment_plan/links/link_path.rb +27 -0
- data/lib/bosh/director/deployment_plan/links/links_resolver.rb +70 -0
- data/lib/bosh/director/deployment_plan/links/template_link.rb +21 -0
- data/lib/bosh/director/deployment_plan/manifest_migrator.rb +3 -17
- data/lib/bosh/director/deployment_plan/manifest_validator.rb +46 -0
- data/lib/bosh/director/deployment_plan/manual_network.rb +70 -97
- data/lib/bosh/director/deployment_plan/manual_network_subnet.rb +148 -0
- data/lib/bosh/director/deployment_plan/network.rb +50 -39
- data/lib/bosh/director/deployment_plan/network_planner.rb +4 -0
- data/lib/bosh/director/deployment_plan/network_planner/plan.rb +26 -0
- data/lib/bosh/director/deployment_plan/network_planner/planner.rb +21 -0
- data/lib/bosh/director/deployment_plan/network_planner/reservation_reconciler.rb +81 -0
- data/lib/bosh/director/deployment_plan/network_planner/vip_static_ips_planner.rb +50 -0
- data/lib/bosh/director/deployment_plan/network_settings.rb +65 -0
- data/lib/bosh/director/deployment_plan/options/skip_drain.rb +7 -0
- data/lib/bosh/director/deployment_plan/package_validator.rb +79 -0
- data/lib/bosh/director/deployment_plan/placement_planner.rb +8 -0
- data/lib/bosh/director/deployment_plan/placement_planner/availability_zone_picker.rb +90 -0
- data/lib/bosh/director/deployment_plan/placement_planner/bruteforce_ip_allocation.rb +124 -0
- data/lib/bosh/director/deployment_plan/placement_planner/index_assigner.rb +32 -0
- data/lib/bosh/director/deployment_plan/placement_planner/networks_to_static_ips.rb +125 -0
- data/lib/bosh/director/deployment_plan/placement_planner/placed_desired_instances.rb +40 -0
- data/lib/bosh/director/deployment_plan/placement_planner/plan.rb +42 -0
- data/lib/bosh/director/deployment_plan/placement_planner/static_ips_availability_zone_picker.rb +237 -0
- data/lib/bosh/director/deployment_plan/placement_planner/unplaced_existing_instances.rb +53 -0
- data/lib/bosh/director/deployment_plan/planner.rb +186 -74
- data/lib/bosh/director/deployment_plan/planner_factory.rb +30 -147
- data/lib/bosh/director/deployment_plan/release_version.rb +3 -3
- data/lib/bosh/director/deployment_plan/resource_pool.rb +2 -174
- data/lib/bosh/director/deployment_plan/stemcell.rb +57 -14
- data/lib/bosh/director/deployment_plan/steps/package_compile_step.rb +28 -135
- data/lib/bosh/director/deployment_plan/steps/update_step.rb +23 -44
- data/lib/bosh/director/deployment_plan/template.rb +15 -4
- data/lib/bosh/director/deployment_plan/vip_network.rb +14 -42
- data/lib/bosh/director/deployment_plan/vm.rb +1 -99
- data/lib/bosh/director/deployment_plan/vm_type.rb +27 -0
- data/lib/bosh/director/disk_manager.rb +268 -0
- data/lib/bosh/director/dns/canonicalizer.rb +28 -0
- data/lib/bosh/director/dns/dns_manager.rb +163 -0
- data/lib/bosh/director/dns/local_dns_repo.rb +20 -0
- data/lib/bosh/director/dns/powerdns.rb +170 -0
- data/lib/bosh/director/errand/job_manager.rb +18 -29
- data/lib/bosh/director/error_ignorer.rb +16 -0
- data/lib/bosh/director/errors.rb +51 -20
- data/lib/bosh/director/event_log.rb +6 -0
- data/lib/bosh/director/instance_deleter.rb +53 -81
- data/lib/bosh/director/instance_reuser.rb +89 -0
- data/lib/bosh/director/instance_updater.rb +139 -281
- data/lib/bosh/director/instance_updater/preparer.rb +8 -5
- data/lib/bosh/director/instance_updater/state_applier.rb +21 -0
- data/lib/bosh/director/ip_util.rb +46 -26
- data/lib/bosh/director/job_renderer.rb +22 -10
- data/lib/bosh/director/job_runner.rb +1 -4
- data/lib/bosh/director/job_updater.rb +47 -35
- data/lib/bosh/director/job_updater_factory.rb +5 -4
- data/lib/bosh/director/jobs/base_job.rb +8 -0
- data/lib/bosh/director/jobs/cleanup_artifacts.rb +93 -0
- data/lib/bosh/director/jobs/delete_deployment.rb +10 -154
- data/lib/bosh/director/jobs/delete_deployment_snapshots.rb +1 -1
- data/lib/bosh/director/jobs/delete_orphan_disks.rb +44 -0
- data/lib/bosh/director/jobs/delete_release.rb +19 -196
- data/lib/bosh/director/jobs/delete_stemcell.rb +10 -76
- data/lib/bosh/director/jobs/export_release.rb +41 -121
- data/lib/bosh/director/jobs/fetch_logs.rb +0 -6
- data/lib/bosh/director/jobs/helpers.rb +10 -0
- data/lib/bosh/director/jobs/helpers/blob_deleter.rb +24 -0
- data/lib/bosh/director/jobs/helpers/compiled_package_deleter.rb +24 -0
- data/lib/bosh/director/jobs/helpers/name_version_release_deleter.rb +48 -0
- data/lib/bosh/director/jobs/helpers/package_deleter.rb +33 -0
- data/lib/bosh/director/jobs/helpers/release_deleter.rb +52 -0
- data/lib/bosh/director/jobs/helpers/release_version_deleter.rb +115 -0
- data/lib/bosh/director/jobs/helpers/releases_to_delete_picker.rb +31 -0
- data/lib/bosh/director/jobs/helpers/stemcell_deleter.rb +61 -0
- data/lib/bosh/director/jobs/helpers/stemcells_to_delete_picker.rb +30 -0
- data/lib/bosh/director/jobs/helpers/template_deleter.rb +20 -0
- data/lib/bosh/director/jobs/release/release_job.rb +18 -7
- data/lib/bosh/director/jobs/run_errand.rb +57 -36
- data/lib/bosh/director/jobs/scheduled_orphan_cleanup.rb +46 -0
- data/lib/bosh/director/jobs/ssh.rb +50 -17
- data/lib/bosh/director/jobs/update_deployment.rb +29 -11
- data/lib/bosh/director/jobs/update_release.rb +25 -4
- data/lib/bosh/director/jobs/vm_state.rb +23 -32
- data/lib/bosh/director/lock.rb +13 -8
- data/lib/bosh/director/logs_fetcher.rb +1 -1
- data/lib/bosh/director/models.rb +3 -0
- data/lib/bosh/director/models/compiled_package.rb +3 -3
- data/lib/bosh/director/models/deployment.rb +10 -0
- data/lib/bosh/director/models/instance.rb +77 -1
- data/lib/bosh/director/models/ip_address.rb +26 -0
- data/lib/bosh/director/models/orphan_disk.rb +23 -0
- data/lib/bosh/director/models/orphan_snapshot.rb +14 -0
- data/lib/bosh/director/models/template.rb +32 -9
- data/lib/bosh/director/models/vm.rb +5 -8
- data/lib/bosh/director/network_reservation.rb +69 -99
- data/lib/bosh/director/problem_handlers/inactive_disk.rb +5 -20
- data/lib/bosh/director/problem_handlers/missing_disk.rb +2 -13
- data/lib/bosh/director/problem_resolver.rb +2 -2
- data/lib/bosh/director/problem_scanner/vm_scan_stage.rb +2 -21
- data/lib/bosh/director/scheduler.rb +23 -6
- data/lib/bosh/director/{instance_updater/stopper.rb → stopper.rb} +24 -18
- data/lib/bosh/director/tagged_logger.rb +30 -0
- data/lib/bosh/director/transactor.rb +9 -0
- data/lib/bosh/director/version.rb +1 -1
- data/lib/bosh/director/vm_creator.rb +91 -19
- data/lib/bosh/director/vm_deleter.rb +25 -0
- data/lib/bosh/director/vm_recreator.rb +15 -0
- data/lib/cloud/dummy.rb +381 -94
- metadata +110 -30
- data/lib/bosh/director/deployment_plan/dns_binder.rb +0 -45
- data/lib/bosh/director/deployment_plan/instance_vm_binder.rb +0 -37
- data/lib/bosh/director/deployment_plan/network_subnet.rb +0 -166
- data/lib/bosh/director/deployment_plan/resource_pools.rb +0 -68
- data/lib/bosh/director/dns_helper.rb +0 -223
- data/lib/bosh/director/instance_updater/network_updater.rb +0 -110
- data/lib/bosh/director/instance_updater/vm_updater.rb +0 -189
- data/lib/bosh/director/problem_handlers/out_of_sync_vm.rb +0 -64
- data/lib/bosh/director/problem_handlers/unbound_instance_vm.rb +0 -85
- data/lib/bosh/director/resource_pool_updater.rb +0 -174
- data/lib/bosh/director/vm_data.rb +0 -63
- data/lib/bosh/director/vm_reuser.rb +0 -63
@@ -0,0 +1,25 @@
|
|
1
|
+
module Bosh::Director
|
2
|
+
class VmDeleter
|
3
|
+
def initialize(cloud, logger, options={})
|
4
|
+
@cloud = cloud
|
5
|
+
@logger = logger
|
6
|
+
|
7
|
+
force = options.fetch(:force, false)
|
8
|
+
@error_ignorer = ErrorIgnorer.new(force, @logger)
|
9
|
+
end
|
10
|
+
|
11
|
+
def delete_for_instance_plan(instance_plan)
|
12
|
+
instance_model = instance_plan.instance_model
|
13
|
+
|
14
|
+
if instance_model.vm
|
15
|
+
delete_vm(instance_model.vm)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
def delete_vm(vm_model)
|
20
|
+
@logger.info('Deleting VM')
|
21
|
+
@error_ignorer.with_force_check { @cloud.delete_vm(vm_model.cid) }
|
22
|
+
vm_model.destroy
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
module Bosh::Director
|
2
|
+
class VmRecreator
|
3
|
+
|
4
|
+
def initialize(vm_creator, vm_deleter)
|
5
|
+
@vm_creator = vm_creator
|
6
|
+
@vm_deleter = vm_deleter
|
7
|
+
end
|
8
|
+
|
9
|
+
def recreate_vm(instance_plan, disk_cid)
|
10
|
+
@vm_deleter.delete_for_instance_plan(instance_plan)
|
11
|
+
disks = [instance_plan.instance.model.persistent_disk_cid, disk_cid].compact
|
12
|
+
@vm_creator.create_for_instance_plan(instance_plan, disks)
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
data/lib/cloud/dummy.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'digest/sha1'
|
2
2
|
require 'fileutils'
|
3
3
|
require 'securerandom'
|
4
|
+
require 'membrane'
|
4
5
|
|
5
6
|
module Bosh
|
6
7
|
module Clouds
|
@@ -18,127 +19,176 @@ module Bosh
|
|
18
19
|
end
|
19
20
|
|
20
21
|
@running_vms_dir = File.join(@base_dir, 'running_vms')
|
22
|
+
@vm_repo = VMRepo.new(@running_vms_dir)
|
21
23
|
@tmp_dir = File.join(@base_dir, 'tmp')
|
22
24
|
FileUtils.mkdir_p(@tmp_dir)
|
23
25
|
|
24
26
|
@logger = Logging::Logger.new('DummyCPI')
|
25
27
|
@logger.add_appenders(Logging.appenders.io(
|
26
|
-
|
27
|
-
|
28
|
-
|
28
|
+
'DummyCPIIO',
|
29
|
+
options['log_buffer'] || STDOUT
|
30
|
+
))
|
29
31
|
|
30
32
|
@commands = CommandTransport.new(@base_dir, @logger)
|
33
|
+
@inputs_recorder = InputsRecorder.new(@base_dir, @logger)
|
31
34
|
|
32
|
-
|
35
|
+
prepare
|
33
36
|
rescue Errno::EACCES
|
34
37
|
raise ArgumentError, "cannot create dummy cloud base directory #{@base_dir}"
|
35
38
|
end
|
36
39
|
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
+
CREATE_STEMCELL_SCHEMA = Membrane::SchemaParser.parse { {image_path: String, cloud_properties: Hash} }
|
41
|
+
def create_stemcell(image_path, cloud_properties)
|
42
|
+
validate_and_record_inputs(CREATE_STEMCELL_SCHEMA, __method__, image_path, cloud_properties)
|
43
|
+
|
44
|
+
content = File.read(image_path)
|
45
|
+
data = YAML.load(content)
|
46
|
+
data.merge!('image' => image_path)
|
47
|
+
stemcell_id = Digest::SHA1.hexdigest(content)
|
48
|
+
|
49
|
+
File.write(stemcell_file(stemcell_id), YAML.dump(data))
|
40
50
|
stemcell_id
|
41
51
|
end
|
42
52
|
|
43
|
-
|
44
|
-
|
53
|
+
DELETE_STEMCELL_SCHEMA = Membrane::SchemaParser.parse { {stemcell_id: String} }
|
54
|
+
def delete_stemcell(stemcell_id)
|
55
|
+
validate_and_record_inputs(DELETE_STEMCELL_SCHEMA, __method__, stemcell_id)
|
56
|
+
FileUtils.rm(stemcell_file(stemcell_id))
|
57
|
+
end
|
58
|
+
|
59
|
+
CREATE_VM_SCHEMA = Membrane::SchemaParser.parse do
|
60
|
+
{
|
61
|
+
agent_id: String,
|
62
|
+
stemcell_id: String,
|
63
|
+
cloud_properties: Hash,
|
64
|
+
networks: Hash,
|
65
|
+
disk_cids: [String],
|
66
|
+
env: Hash,
|
67
|
+
}
|
45
68
|
end
|
46
69
|
|
47
70
|
# rubocop:disable ParameterLists
|
48
|
-
def create_vm(agent_id,
|
49
|
-
|
71
|
+
def create_vm(agent_id, stemcell_id, cloud_properties, networks, disk_cids, env)
|
72
|
+
# rubocop:enable ParameterLists
|
50
73
|
@logger.info('Dummy: create_vm')
|
74
|
+
validate_and_record_inputs(CREATE_VM_SCHEMA, __method__, agent_id, stemcell_id, cloud_properties, networks, disk_cids, env)
|
51
75
|
|
52
76
|
ips = []
|
53
77
|
cmd = commands.next_create_vm_cmd
|
54
78
|
|
55
|
-
if cmd.
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
ips << { 'network' => network_name, 'ip' => network
|
79
|
+
if cmd.failed?
|
80
|
+
raise Bosh::Clouds::CloudError.new("Creating vm failed")
|
81
|
+
end
|
82
|
+
|
83
|
+
networks.each do |network_name, network|
|
84
|
+
if network['type'] != 'dynamic'
|
85
|
+
ips << { 'network' => network_name, 'ip' => network.fetch('ip') }
|
86
|
+
else
|
87
|
+
if cmd.ip_address
|
88
|
+
ip_address = cmd.ip_address
|
89
|
+
elsif cloud_properties['az_name']
|
90
|
+
ip_address = cmd.ip_address_for_az(cloud_properties['az_name'])
|
91
|
+
else
|
92
|
+
ip_address = NetAddr::CIDRv4.new(rand(0..4294967295)).ip #collisions?
|
93
|
+
end
|
94
|
+
|
95
|
+
if ip_address
|
96
|
+
ips << { 'network' => network_name, 'ip' => ip_address }
|
97
|
+
write_agent_default_network(agent_id, ip_address)
|
98
|
+
end
|
62
99
|
end
|
63
100
|
end
|
64
101
|
|
65
102
|
allocate_ips(ips)
|
66
103
|
|
67
104
|
write_agent_settings(agent_id, {
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
105
|
+
agent_id: agent_id,
|
106
|
+
blobstore: @options['agent']['blobstore'],
|
107
|
+
ntp: [],
|
108
|
+
disks: { persistent: {} },
|
109
|
+
networks: networks,
|
110
|
+
vm: { name: "vm-#{agent_id}" },
|
111
|
+
cert: '',
|
112
|
+
mbus: @options['nats'],
|
113
|
+
})
|
77
114
|
|
78
115
|
agent_pid = spawn_agent_process(agent_id)
|
116
|
+
vm = VM.new(agent_pid.to_s, agent_id, cloud_properties, ips)
|
79
117
|
|
80
|
-
|
81
|
-
File.write(vm_file(agent_pid), JSON.dump("agent_id" => agent_id, "ips" => ips))
|
118
|
+
@vm_repo.save(vm)
|
82
119
|
|
83
|
-
|
120
|
+
vm.id
|
84
121
|
end
|
85
122
|
|
86
|
-
|
87
|
-
|
123
|
+
DELETE_VM_SCHEMA = Membrane::SchemaParser.parse { {vm_cid: String} }
|
124
|
+
def delete_vm(vm_cid)
|
125
|
+
validate_and_record_inputs(DELETE_VM_SCHEMA, __method__, vm_cid)
|
126
|
+
commands.wait_for_unpause_delete_vms
|
127
|
+
detach_disks_attached_to_vm(vm_cid)
|
128
|
+
agent_pid = vm_cid.to_i
|
88
129
|
Process.kill('KILL', agent_pid)
|
89
|
-
|
90
|
-
|
130
|
+
|
131
|
+
# rubocop:disable HandleExceptions
|
132
|
+
rescue Errno::ESRCH
|
91
133
|
# rubocop:enable HandleExceptions
|
92
|
-
@logger.info("Dummy CPI delete_vm failed for agent pid #{vm_name}. #{e}")
|
93
134
|
ensure
|
94
|
-
free_ips(
|
95
|
-
FileUtils.rm_rf(File.join(@base_dir, 'running_vms',
|
135
|
+
free_ips(vm_cid)
|
136
|
+
FileUtils.rm_rf(File.join(@base_dir, 'running_vms', vm_cid))
|
96
137
|
end
|
97
138
|
|
98
|
-
|
139
|
+
REBOOT_VM_SCHEMA = Membrane::SchemaParser.parse { {vm_cid: String} }
|
140
|
+
def reboot_vm(vm_cid)
|
141
|
+
validate_and_record_inputs(__method__, vm_cid)
|
99
142
|
raise NotImplemented, 'Dummy CPI does not implement reboot_vm'
|
100
143
|
end
|
101
144
|
|
102
|
-
|
103
|
-
|
145
|
+
HAS_VM_SCHEMA = Membrane::SchemaParser.parse { {vm_cid: String} }
|
146
|
+
def has_vm?(vm_cid)
|
147
|
+
validate_and_record_inputs(HAS_VM_SCHEMA, __method__, vm_cid)
|
148
|
+
@vm_repo.exists?(vm_cid)
|
104
149
|
end
|
105
150
|
|
151
|
+
HAS_DISK_SCHEMA = Membrane::SchemaParser.parse { {disk_id: String} }
|
106
152
|
def has_disk?(disk_id)
|
153
|
+
validate_and_record_inputs(HAS_DISK_SCHEMA, __method__, disk_id)
|
107
154
|
File.exists?(disk_file(disk_id))
|
108
155
|
end
|
109
156
|
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
# Normally runit would handle that.
|
116
|
-
if cmd.not_supported || true
|
117
|
-
raise NotSupported, 'Dummy CPI was configured to return NotSupported'
|
157
|
+
ATTACH_DISK_SCHEMA = Membrane::SchemaParser.parse { {vm_cid: String, disk_id: String} }
|
158
|
+
def attach_disk(vm_cid, disk_id)
|
159
|
+
validate_and_record_inputs(ATTACH_DISK_SCHEMA, __method__, vm_cid, disk_id)
|
160
|
+
if disk_attached?(disk_id)
|
161
|
+
raise "#{disk_id} is already attached to an instance"
|
118
162
|
end
|
119
|
-
|
120
|
-
|
121
|
-
def attach_disk(vm_id, disk_id)
|
122
|
-
file = attachment_file(vm_id, disk_id)
|
163
|
+
file = attachment_file(vm_cid, disk_id)
|
123
164
|
FileUtils.mkdir_p(File.dirname(file))
|
124
165
|
FileUtils.touch(file)
|
125
166
|
|
126
|
-
|
167
|
+
@logger.info("Attached disk: '#{disk_id}' to vm: '#{vm_cid}' at attachment file: #{file}")
|
168
|
+
|
169
|
+
agent_id = agent_id_for_vm_id(vm_cid)
|
127
170
|
settings = read_agent_settings(agent_id)
|
128
171
|
settings['disks']['persistent'][disk_id] = 'attached'
|
129
172
|
write_agent_settings(agent_id, settings)
|
130
173
|
end
|
131
174
|
|
132
|
-
|
133
|
-
|
175
|
+
DETACH_DISK_SCHEMA = Membrane::SchemaParser.parse { {vm_cid: String, disk_id: String} }
|
176
|
+
def detach_disk(vm_cid, disk_id)
|
177
|
+
validate_and_record_inputs(DETACH_DISK_SCHEMA, __method__, vm_cid, disk_id)
|
178
|
+
unless disk_attached_to_vm?(vm_cid, disk_id)
|
179
|
+
raise Bosh::Clouds::DiskNotAttached, "#{disk_id} is not attached to instance #{vm_cid}"
|
180
|
+
end
|
181
|
+
FileUtils.rm(attachment_file(vm_cid, disk_id))
|
134
182
|
|
135
|
-
agent_id = agent_id_for_vm_id(
|
183
|
+
agent_id = agent_id_for_vm_id(vm_cid)
|
136
184
|
settings = read_agent_settings(agent_id)
|
137
185
|
settings['disks']['persistent'].delete(disk_id)
|
138
186
|
write_agent_settings(agent_id, settings)
|
139
187
|
end
|
140
188
|
|
141
|
-
|
189
|
+
CREATE_DISK_SCHEMA = Membrane::SchemaParser.parse { {size: Integer, cloud_properties: Hash, vm_locality: String} }
|
190
|
+
def create_disk(size, cloud_properties, vm_locality)
|
191
|
+
validate_and_record_inputs(CREATE_DISK_SCHEMA, __method__, size, cloud_properties, vm_locality)
|
142
192
|
disk_id = SecureRandom.hex
|
143
193
|
file = disk_file(disk_id)
|
144
194
|
FileUtils.mkdir_p(File.dirname(file))
|
@@ -146,11 +196,15 @@ module Bosh
|
|
146
196
|
disk_id
|
147
197
|
end
|
148
198
|
|
199
|
+
DELTE_DISK_SCHEMA = Membrane::SchemaParser.parse { {disk_id: String} }
|
149
200
|
def delete_disk(disk_id)
|
201
|
+
validate_and_record_inputs(DELTE_DISK_SCHEMA, __method__, disk_id)
|
150
202
|
FileUtils.rm(disk_file(disk_id))
|
151
203
|
end
|
152
204
|
|
153
|
-
|
205
|
+
SNAPSHOT_DISK_SCHEMA = Membrane::SchemaParser.parse { {disk_id: String, metadata: Hash} }
|
206
|
+
def snapshot_disk(disk_id, metadata)
|
207
|
+
validate_and_record_inputs(SNAPSHOT_DISK_SCHEMA, __method__, disk_id, metadata)
|
154
208
|
snapshot_id = SecureRandom.hex
|
155
209
|
file = snapshot_file(snapshot_id)
|
156
210
|
FileUtils.mkdir_p(File.dirname(file))
|
@@ -158,12 +212,28 @@ module Bosh
|
|
158
212
|
snapshot_id
|
159
213
|
end
|
160
214
|
|
215
|
+
DELETE_SNAPSHOT_SCHEMA = Membrane::SchemaParser.parse { {snapshot_id: String} }
|
161
216
|
def delete_snapshot(snapshot_id)
|
217
|
+
validate_and_record_inputs(DELETE_SNAPSHOT_SCHEMA, __method__, snapshot_id)
|
162
218
|
FileUtils.rm(snapshot_file(snapshot_id))
|
163
219
|
end
|
164
220
|
|
221
|
+
SET_VM_METADATA_SCHEMA = Membrane::SchemaParser.parse { {vm_cid: String, metadata: Hash} }
|
222
|
+
def set_vm_metadata(vm_cid, metadata)
|
223
|
+
validate_and_record_inputs(SET_VM_METADATA_SCHEMA, __method__, vm_cid, metadata)
|
224
|
+
end
|
225
|
+
|
165
226
|
# Additional Dummy test helpers
|
166
227
|
|
228
|
+
def prepare
|
229
|
+
FileUtils.mkdir_p(@base_dir)
|
230
|
+
end
|
231
|
+
|
232
|
+
def reset
|
233
|
+
FileUtils.rm_rf(@base_dir)
|
234
|
+
prepare
|
235
|
+
end
|
236
|
+
|
167
237
|
def vm_cids
|
168
238
|
# Shuffle so that no one relies on the order of VMs
|
169
239
|
Dir.glob(File.join(@running_vms_dir, '*')).map { |vm| File.basename(vm) }.shuffle
|
@@ -178,9 +248,9 @@ module Bosh
|
|
178
248
|
vm_cids.each do |agent_pid|
|
179
249
|
begin
|
180
250
|
Process.kill('KILL', agent_pid.to_i)
|
181
|
-
|
251
|
+
# rubocop:disable HandleExceptions
|
182
252
|
rescue Errno::ESRCH
|
183
|
-
|
253
|
+
# rubocop:enable HandleExceptions
|
184
254
|
end
|
185
255
|
end
|
186
256
|
end
|
@@ -189,7 +259,54 @@ module Bosh
|
|
189
259
|
"#{@base_dir}/agent.#{agent_id}.log"
|
190
260
|
end
|
191
261
|
|
192
|
-
def
|
262
|
+
def read_cloud_properties(vm_cid)
|
263
|
+
@vm_repo.load(vm_cid).cloud_properties
|
264
|
+
end
|
265
|
+
|
266
|
+
def invocations
|
267
|
+
@inputs_recorder.read_all
|
268
|
+
end
|
269
|
+
|
270
|
+
def invocations_for_method(method)
|
271
|
+
@inputs_recorder.read(method)
|
272
|
+
end
|
273
|
+
|
274
|
+
def all_stemcells
|
275
|
+
files = Dir.entries(@base_dir).select { |file| file.match /stemcell_./ }
|
276
|
+
|
277
|
+
Dir.chdir(@base_dir) do
|
278
|
+
[].tap do |results|
|
279
|
+
files.each do |file|
|
280
|
+
# data --> [{ 'name' => 'ubuntu-stemcell', 'version': '1', 'image' => <image path> }]
|
281
|
+
data = YAML.load(File.read(file))
|
282
|
+
results << { 'id' => file.sub(/^stemcell_/, '') }.merge(data)
|
283
|
+
end
|
284
|
+
end.sort { |a, b| a[:version].to_i <=> b[:version].to_i }
|
285
|
+
end
|
286
|
+
end
|
287
|
+
|
288
|
+
def latest_stemcell
|
289
|
+
all_stemcells.last
|
290
|
+
end
|
291
|
+
|
292
|
+
def all_snapshots
|
293
|
+
if File.exists?(snapshot_file(''))
|
294
|
+
Dir.glob(snapshot_file('*'))
|
295
|
+
else
|
296
|
+
[]
|
297
|
+
end
|
298
|
+
end
|
299
|
+
|
300
|
+
def all_ips
|
301
|
+
Dir.glob(File.join(@base_dir, 'dummy_cpi_networks', '*'))
|
302
|
+
.reject { |path| File.directory?(path) }
|
303
|
+
.map { |path| File.basename(path) }
|
304
|
+
end
|
305
|
+
|
306
|
+
def agent_dir_for_vm_cid(vm_cid)
|
307
|
+
agent_id = agent_id_for_vm_id(vm_cid)
|
308
|
+
agent_base_dir(agent_id)
|
309
|
+
end
|
193
310
|
|
194
311
|
private
|
195
312
|
|
@@ -218,7 +335,7 @@ module Bosh
|
|
218
335
|
def allocate_ips(ips)
|
219
336
|
ips.each do |ip|
|
220
337
|
begin
|
221
|
-
network_dir = File.join(@base_dir, 'dummy_cpi_networks'
|
338
|
+
network_dir = File.join(@base_dir, 'dummy_cpi_networks')
|
222
339
|
FileUtils.makedirs(network_dir)
|
223
340
|
open(File.join(network_dir, ip['ip']), File::WRONLY|File::CREAT|File::EXCL).close
|
224
341
|
rescue Errno::EEXIST
|
@@ -229,18 +346,16 @@ module Bosh
|
|
229
346
|
end
|
230
347
|
end
|
231
348
|
|
232
|
-
def free_ips(
|
233
|
-
|
234
|
-
|
349
|
+
def free_ips(vm_cid)
|
350
|
+
return unless @vm_repo.exists?(vm_cid)
|
351
|
+
vm = @vm_repo.load(vm_cid)
|
352
|
+
vm.ips.each do |ip|
|
353
|
+
FileUtils.rm_rf(File.join(@base_dir, 'dummy_cpi_networks', ip['ip']))
|
235
354
|
end
|
236
355
|
end
|
237
356
|
|
238
|
-
def
|
239
|
-
|
240
|
-
end
|
241
|
-
|
242
|
-
def agent_id_for_vm_id(vm_id)
|
243
|
-
JSON.parse(File.read(vm_file(vm_id)))['agent_id']
|
357
|
+
def agent_id_for_vm_id(vm_cid)
|
358
|
+
@vm_repo.load(vm_cid).agent_id
|
244
359
|
end
|
245
360
|
|
246
361
|
def agent_settings_file(agent_id)
|
@@ -273,9 +388,9 @@ module Bosh
|
|
273
388
|
'Infrastructure' => {
|
274
389
|
'Settings' => {
|
275
390
|
'Sources' => [{
|
276
|
-
|
277
|
-
|
278
|
-
|
391
|
+
'Type' => 'File',
|
392
|
+
'SettingsPath' => agent_settings_file(agent_id)
|
393
|
+
}],
|
279
394
|
'UseRegistry' => true
|
280
395
|
}
|
281
396
|
}
|
@@ -296,64 +411,236 @@ module Bosh
|
|
296
411
|
File.join(@base_dir, "stemcell_#{stemcell_id}")
|
297
412
|
end
|
298
413
|
|
299
|
-
def vm_file(vm_id)
|
300
|
-
File.join(@running_vms_dir, vm_id.to_s)
|
301
|
-
end
|
302
|
-
|
303
414
|
def disk_file(disk_id)
|
304
415
|
File.join(@base_dir, 'disks', disk_id)
|
305
416
|
end
|
306
417
|
|
307
|
-
def
|
308
|
-
File.
|
418
|
+
def disk_attached?(disk_id)
|
419
|
+
File.exist?(attachment_path(disk_id))
|
420
|
+
end
|
421
|
+
|
422
|
+
def disk_attached_to_vm?(vm_cid, disk_id)
|
423
|
+
File.exist?(attachment_file(vm_cid, disk_id))
|
424
|
+
end
|
425
|
+
|
426
|
+
def detach_disks_attached_to_vm(vm_cid)
|
427
|
+
@logger.info("Detaching disks for vm #{vm_cid}")
|
428
|
+
Dir.glob(attachment_file(vm_cid, '*')) do |file_path|
|
429
|
+
@logger.info("Detaching found attachment #{file_path}")
|
430
|
+
FileUtils.rm_rf(File.dirname(file_path))
|
431
|
+
end
|
432
|
+
end
|
433
|
+
|
434
|
+
def attachment_file(vm_cid, disk_id)
|
435
|
+
File.join(attachment_path(disk_id), vm_cid)
|
436
|
+
end
|
437
|
+
|
438
|
+
def attachment_path(disk_id)
|
439
|
+
File.join(@base_dir, 'attachments', disk_id)
|
309
440
|
end
|
310
441
|
|
311
442
|
def snapshot_file(snapshot_id)
|
312
443
|
File.join(@base_dir, 'snapshots', snapshot_id)
|
313
444
|
end
|
314
445
|
|
446
|
+
def validate_and_record_inputs(schema, the_method, *args)
|
447
|
+
parameter_names_to_values = parameter_names_to_values(the_method, *args)
|
448
|
+
begin
|
449
|
+
schema.validate(parameter_names_to_values)
|
450
|
+
rescue Membrane::SchemaValidationError => err
|
451
|
+
raise ArgumentError, "Invalid arguments sent to #{the_method}: #{err.message}"
|
452
|
+
end
|
453
|
+
record_inputs(the_method, parameter_names_to_values)
|
454
|
+
end
|
455
|
+
|
456
|
+
def record_inputs(method, args)
|
457
|
+
@inputs_recorder.record(method, args)
|
458
|
+
end
|
459
|
+
|
460
|
+
def parameter_names_to_values(the_method, *the_method_args)
|
461
|
+
hash = {}
|
462
|
+
method(the_method).parameters.each_with_index do |param, index|
|
463
|
+
hash[param[1]] = the_method_args[index]
|
464
|
+
end
|
465
|
+
hash
|
466
|
+
end
|
467
|
+
|
315
468
|
# Example file system layout for arranging commands information.
|
316
469
|
# Currently uses file system as transport but could be switch to use NATS.
|
317
470
|
# base_dir/cpi/create_vm/next -> {"something": true}
|
318
|
-
# base_dir/cpi/configure_networks/<vm_id> -> (presence)
|
319
471
|
class CommandTransport
|
320
472
|
def initialize(base_dir, logger)
|
321
473
|
@cpi_commands = File.join(base_dir, 'cpi_commands')
|
322
474
|
@logger = logger
|
323
475
|
end
|
324
476
|
|
325
|
-
def
|
326
|
-
@logger.info("
|
327
|
-
path = File.join(@cpi_commands, '
|
477
|
+
def pause_delete_vms
|
478
|
+
@logger.info("Pausing delete_vms")
|
479
|
+
path = File.join(@cpi_commands, 'pause_delete_vms')
|
328
480
|
FileUtils.mkdir_p(File.dirname(path))
|
329
481
|
File.write(path, 'marker')
|
330
482
|
end
|
331
483
|
|
332
|
-
def
|
333
|
-
@logger.info("
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
484
|
+
def unpause_delete_vms
|
485
|
+
@logger.info("Unpausing delete_vms")
|
486
|
+
FileUtils.rm_rf File.join(@cpi_commands, 'pause_delete_vms')
|
487
|
+
FileUtils.rm_rf File.join(@cpi_commands, 'wait_for_unpause_delete_vms')
|
488
|
+
end
|
489
|
+
|
490
|
+
def wait_for_delete_vms
|
491
|
+
@logger.info("Wait for delete_vms")
|
492
|
+
path = File.join(@cpi_commands, 'wait_for_unpause_delete_vms')
|
493
|
+
sleep(0.1) until File.exists?(path)
|
494
|
+
end
|
495
|
+
|
496
|
+
def wait_for_unpause_delete_vms
|
497
|
+
path = File.join(@cpi_commands, 'wait_for_unpause_delete_vms')
|
498
|
+
FileUtils.mkdir_p(File.dirname(path))
|
499
|
+
File.write(path, 'marker')
|
500
|
+
|
501
|
+
path = File.join(@cpi_commands, 'pause_delete_vms')
|
502
|
+
if File.exists?(path)
|
503
|
+
@logger.info("Wait for unpausing delete_vms")
|
504
|
+
end
|
505
|
+
sleep(0.1) while File.exists?(path)
|
338
506
|
end
|
339
507
|
|
340
508
|
def make_create_vm_always_use_dynamic_ip(ip_address)
|
341
509
|
@logger.info("Making create_vm method to set ip address #{ip_address}")
|
342
|
-
always_path = File.join(@cpi_commands, 'create_vm', 'always')
|
343
510
|
FileUtils.mkdir_p(File.dirname(always_path))
|
344
511
|
File.write(always_path, ip_address)
|
345
512
|
end
|
346
513
|
|
514
|
+
def set_dynamic_ips_for_azs(az_to_ips)
|
515
|
+
@logger.info("Making create_vm method to set #{az_to_ips.inspect}")
|
516
|
+
FileUtils.mkdir_p(File.dirname(azs_path))
|
517
|
+
File.write(azs_path, JSON.generate(az_to_ips))
|
518
|
+
end
|
519
|
+
|
520
|
+
def make_create_vm_always_fail
|
521
|
+
@logger.info("Making create_vm method always fail")
|
522
|
+
FileUtils.mkdir_p(File.dirname(failed_path))
|
523
|
+
File.write(failed_path, "")
|
524
|
+
end
|
525
|
+
|
526
|
+
def allow_create_vm_to_succeed
|
527
|
+
@logger.info("Allowing create_vm method to succeed (removing any mandatory failures)")
|
528
|
+
FileUtils.rm(failed_path)
|
529
|
+
end
|
530
|
+
|
347
531
|
def next_create_vm_cmd
|
348
532
|
@logger.info('Reading create_vm configuration')
|
349
|
-
always_path = File.join(@cpi_commands, 'create_vm', 'always')
|
350
533
|
ip_address = File.read(always_path) if File.exists?(always_path)
|
351
|
-
|
534
|
+
azs_to_ip = File.exists?(azs_path) ? JSON.load(File.read(azs_path)) : {}
|
535
|
+
failed = File.exists?(failed_path)
|
536
|
+
CreateVmCommand.new(ip_address, azs_to_ip, failed)
|
537
|
+
end
|
538
|
+
|
539
|
+
private
|
540
|
+
|
541
|
+
def azs_path
|
542
|
+
File.join(@cpi_commands, 'create_vm', 'az_ips')
|
543
|
+
end
|
544
|
+
|
545
|
+
def always_path
|
546
|
+
File.join(@cpi_commands, 'create_vm', 'always')
|
547
|
+
end
|
548
|
+
|
549
|
+
def failed_path
|
550
|
+
File.join(@cpi_commands, 'create_vm', 'fail')
|
352
551
|
end
|
353
552
|
end
|
354
553
|
|
355
554
|
class ConfigureNetworksCommand < Struct.new(:not_supported); end
|
356
|
-
class CreateVmCommand
|
555
|
+
class CreateVmCommand
|
556
|
+
attr_reader :ip_address, :failed
|
557
|
+
|
558
|
+
def initialize(ip_address, azs_to_ip, failed)
|
559
|
+
@ip_address = ip_address
|
560
|
+
@azs_to_ip = azs_to_ip
|
561
|
+
@failed = failed
|
562
|
+
end
|
563
|
+
|
564
|
+
def ip_address_for_az(az_name)
|
565
|
+
@azs_to_ip[az_name]
|
566
|
+
end
|
567
|
+
|
568
|
+
def failed?
|
569
|
+
failed
|
570
|
+
end
|
571
|
+
end
|
572
|
+
|
573
|
+
class InputsRecorder
|
574
|
+
def initialize(base_dir, logger)
|
575
|
+
@cpi_inputs_dir = File.join(base_dir, 'cpi_inputs')
|
576
|
+
@logger = logger
|
577
|
+
end
|
578
|
+
|
579
|
+
def record(method, args)
|
580
|
+
FileUtils.mkdir_p(@cpi_inputs_dir)
|
581
|
+
data = {method_name: method, inputs: args}
|
582
|
+
@logger.info("Saving input for #{method} #{data} #{ordered_file_path}")
|
583
|
+
File.open(ordered_file_path, 'a') { |f| f.puts(JSON.dump(data)) }
|
584
|
+
end
|
585
|
+
|
586
|
+
def read(method_name)
|
587
|
+
@logger.info("Reading input for #{method_name}")
|
588
|
+
read_all.select do |invocation|
|
589
|
+
invocation.method_name == method_name
|
590
|
+
end
|
591
|
+
end
|
592
|
+
|
593
|
+
def read_all
|
594
|
+
@logger.info("Reading all inputs: #{File.read(ordered_file_path)}")
|
595
|
+
result = []
|
596
|
+
File.read(ordered_file_path).split("\n").each do |request|
|
597
|
+
data = JSON.parse(request)
|
598
|
+
result << CpiInvocation.new(data['method_name'], data['inputs'])
|
599
|
+
end
|
600
|
+
result
|
601
|
+
end
|
602
|
+
|
603
|
+
def ordered_file_path
|
604
|
+
File.join(@cpi_inputs_dir, 'all_requests')
|
605
|
+
end
|
606
|
+
end
|
607
|
+
|
608
|
+
class VM < Struct.new(:id, :agent_id, :cloud_properties, :ips)
|
609
|
+
end
|
610
|
+
|
611
|
+
class VMRepo
|
612
|
+
def initialize(running_vms_dir)
|
613
|
+
@running_vms_dir = running_vms_dir
|
614
|
+
FileUtils.mkdir_p(@running_vms_dir)
|
615
|
+
end
|
616
|
+
|
617
|
+
def load(id)
|
618
|
+
attrs = JSON.parse(File.read(vm_file(id)))
|
619
|
+
VM.new(id, attrs.fetch('agent_id'), attrs.fetch('cloud_properties'), attrs.fetch('ips'))
|
620
|
+
end
|
621
|
+
|
622
|
+
def exists?(id)
|
623
|
+
File.exists?(vm_file(id))
|
624
|
+
end
|
625
|
+
|
626
|
+
def save(vm)
|
627
|
+
serialized_vm = JSON.dump({
|
628
|
+
'agent_id' => vm.agent_id,
|
629
|
+
'cloud_properties' => vm.cloud_properties,
|
630
|
+
'ips' => vm.ips,
|
631
|
+
})
|
632
|
+
|
633
|
+
File.write(vm_file(vm.id), serialized_vm)
|
634
|
+
end
|
635
|
+
|
636
|
+
private
|
637
|
+
|
638
|
+
def vm_file(vm_cid)
|
639
|
+
File.join(@running_vms_dir, vm_cid)
|
640
|
+
end
|
641
|
+
end
|
642
|
+
|
643
|
+
class CpiInvocation < Struct.new(:method_name, :inputs); end
|
357
644
|
end
|
358
645
|
end
|
359
646
|
end
|