ops_manager_ui_drivers 2.4.2 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ops_manager_ui_drivers/version.rb +1 -1
  3. data/lib/ops_manager_ui_drivers/version15/settings.rb +39 -45
  4. data/lib/ops_manager_ui_drivers/version16/settings.rb +40 -46
  5. data/lib/ops_manager_ui_drivers/version17/settings.rb +40 -47
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 10b185ebd4621120332f0e757c7fdabc2d4eecf1
4
- data.tar.gz: 2484ab34b3339e6e84691ae2fdcd7945af334263
3
+ metadata.gz: 0c6cbde8dc4b8b67b8b5854ca8cb00641b4867ae
4
+ data.tar.gz: d26368a1f3c17fd9cc8b3ec57e99899a0816ef66
5
5
  SHA512:
6
- metadata.gz: 76791e3d7cae791fafa8e049377322eb2702b928a3dc64742366b5eaa53b48f0c5585c5061994c66cb674ed54ce67b47af387d3cde84f83b5684235ef30a7983
7
- data.tar.gz: 20205bfac70266e61904ca62a29347ef5777e7145d2b161722077c2152c206af98870e506861242ff20865314b3b08855781ab812cf4c1cb69326fffa14679d7
6
+ metadata.gz: ed563cfdb445c3418a0d2d9b3b0c048a68af2c8abd323e6656bffb9c1fc06ab79e038ec8712d8bf70d1fb20a6c5893303e57be1702d954bf685930c9e71603c7
7
+ data.tar.gz: 6b10f49699cdcb647cc17ae468fa50c81a12440945bb2c71452674c632c85df2738bcda1ea1dfc760523017e43df5ee7222b5408c27c108a8c1f2c11a5550a82
data/lib/ops_manager_ui_drivers/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module OpsManagerUiDrivers
2
- VERSION = '2.4.2'
2
+ VERSION = '2.5.0'
3
3
  end
data/lib/ops_manager_ui_drivers/version15/settings.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  using OpsManagerUiDrivers::BackportRefinements
2
+
2
3
  module OpsManagerUiDrivers
3
4
  module Version15
4
5
  module Settings
@@ -22,23 +23,19 @@ module OpsManagerUiDrivers
22
23
 
23
24
  def iaas_configuration_fields
24
25
  {
25
- 'vcd_url' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'url'),
26
- 'organization' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'organization'),
27
- 'vcd_username' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'user'),
28
- 'vcd_password' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'password'),
29
- 'datacenter' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'name'),
30
- 'storage_profile' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'storage_profile'),
31
- 'catalog_name' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'catalog_name'),
26
+ 'vcd_url' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'url'),
27
+ 'organization' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'organization'),
28
+ 'vcd_username' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'user'),
29
+ 'vcd_password' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'password'),
30
+ 'datacenter' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'name'),
31
+ 'storage_profile' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'storage_profile'),
32
+ 'catalog_name' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'catalog_name'),
32
33
  }
33
34
  end
34
35
 
35
36
  def advanced_infrastructure_config_fields
36
37
  {}
37
38
  end
38
-
39
- private
40
-
41
- attr_reader :test_settings
42
39
  end
43
40
 
44
41
  class Vsphere
@@ -52,14 +49,14 @@ module OpsManagerUiDrivers
52
49
 
53
50
  def iaas_configuration_fields
54
51
  {
55
- 'vcenter_ip' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'ip'),
56
- 'vcenter_username' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'username'),
57
- 'vcenter_password' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'password'),
58
- 'datacenter' => test_settings.dig('ops_manager', 'vcenter', 'datacenter'),
59
- 'datastores_string' => test_settings.dig('ops_manager', 'vcenter', 'persistent_datastore'),
60
- 'microbosh_vm_folder' => test_settings.dig('ops_manager', 'vcenter', 'bosh_vm_folder'),
61
- 'microbosh_template_folder' => test_settings.dig('ops_manager', 'vcenter', 'bosh_template_folder'),
62
- 'microbosh_disk_path' => test_settings.dig('ops_manager', 'vcenter', 'bosh_disk_path'),
52
+ 'vcenter_ip' => vcenter_ip(@test_settings),
53
+ 'vcenter_username' => @test_settings.dig('ops_manager', 'vcenter', 'creds', 'username'),
54
+ 'vcenter_password' => @test_settings.dig('ops_manager', 'vcenter', 'creds', 'password'),
55
+ 'datacenter' => @test_settings.dig('ops_manager', 'vcenter', 'datacenter'),
56
+ 'datastores_string' => @test_settings.dig('ops_manager', 'vcenter', 'persistent_datastore'),
57
+ 'microbosh_vm_folder' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_vm_folder'),
58
+ 'microbosh_template_folder' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_template_folder'),
59
+ 'microbosh_disk_path' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_disk_path'),
63
60
  }
64
61
  end
65
62
 
@@ -69,7 +66,10 @@ module OpsManagerUiDrivers
69
66
 
70
67
  private
71
68
 
72
- attr_reader :test_settings
69
+ def vcenter_ip(test_settings)
70
+ test_settings.dig('ops_manager', 'vcenter', 'creds', 'ip') ||
71
+ test_settings.dig('ops_manager', 'vcenter', 'creds', 'host')
72
+ end
73
73
  end
74
74
 
75
75
  class AWS
@@ -83,23 +83,19 @@ module OpsManagerUiDrivers
83
83
 
84
84
  def iaas_configuration_fields
85
85
  {
86
- 'access_key_id' => test_settings.dig('ops_manager', 'aws', 'aws_access_key'),
87
- 'secret_access_key' => test_settings.dig('ops_manager', 'aws', 'aws_secret_key'),
88
- 'vpc_id' => test_settings.dig('ops_manager', 'aws', 'vpc_id'),
89
- 'security_group' => test_settings.dig('ops_manager', 'aws', 'security_group'),
90
- 'key_pair_name' => test_settings.dig('ops_manager', 'aws', 'key_pair_name'),
91
- 'ssh_private_key' => test_settings.dig('ops_manager', 'aws', 'ssh_key'),
92
- 'region' => test_settings.dig('ops_manager', 'aws', 'region'),
86
+ 'access_key_id' => @test_settings.dig('ops_manager', 'aws', 'aws_access_key'),
87
+ 'secret_access_key' => @test_settings.dig('ops_manager', 'aws', 'aws_secret_key'),
88
+ 'vpc_id' => @test_settings.dig('ops_manager', 'aws', 'vpc_id'),
89
+ 'security_group' => @test_settings.dig('ops_manager', 'aws', 'security_group'),
90
+ 'key_pair_name' => @test_settings.dig('ops_manager', 'aws', 'key_pair_name'),
91
+ 'ssh_private_key' => @test_settings.dig('ops_manager', 'aws', 'ssh_key'),
92
+ 'region' => @test_settings.dig('ops_manager', 'aws', 'region'),
93
93
  }
94
94
  end
95
95
 
96
96
  def advanced_infrastructure_config_fields
97
97
  {}
98
98
  end
99
-
100
- private
101
-
102
- attr_reader :test_settings
103
99
  end
104
100
 
105
101
  class OpenStack
@@ -113,25 +109,23 @@ module OpsManagerUiDrivers
113
109
 
114
110
  def iaas_configuration_fields
115
111
  {
116
- 'identity_endpoint' => test_settings.dig('ops_manager', 'openstack', 'identity_endpoint'),
117
- 'username' => test_settings.dig('ops_manager', 'openstack', 'username'),
118
- 'password' => test_settings.dig('ops_manager', 'openstack', 'password'),
119
- 'tenant' => test_settings.dig('ops_manager', 'openstack', 'tenant'),
120
- 'security_group' => test_settings.dig('ops_manager', 'openstack', 'security_group_name'),
121
- 'key_pair_name' => test_settings.dig('ops_manager', 'openstack', 'key_pair_name'),
122
- 'ssh_private_key' => test_settings.dig('ops_manager', 'openstack', 'ssh_private_key'),
123
- 'region' => test_settings.dig('ops_manager', 'openstack', 'region'),
124
- 'disable_dhcp' => test_settings.dig('ops_manager', 'openstack', 'disable_dhcp'),
112
+ 'identity_endpoint' => @test_settings.dig('ops_manager', 'openstack', 'identity_endpoint'),
113
+ 'username' => @test_settings.dig('ops_manager', 'openstack', 'username'),
114
+ 'password' => @test_settings.dig('ops_manager', 'openstack', 'password'),
115
+ 'tenant' => @test_settings.dig('ops_manager', 'openstack', 'tenant'),
116
+ 'security_group' => @test_settings.dig('ops_manager', 'openstack', 'security_group_name'),
117
+ 'key_pair_name' => @test_settings.dig('ops_manager', 'openstack', 'key_pair_name'),
118
+ 'ssh_private_key' => @test_settings.dig('ops_manager', 'openstack', 'ssh_private_key'),
119
+ 'region' => @test_settings.dig('ops_manager', 'openstack', 'region'),
120
+ 'disable_dhcp' => @test_settings.dig('ops_manager', 'openstack', 'disable_dhcp'),
125
121
  }
126
122
  end
127
123
 
128
124
  def advanced_infrastructure_config_fields
129
- {'connection_options' => test_settings.dig('ops_manager', 'openstack', 'connection_options')}
125
+ {
126
+ 'connection_options' => @test_settings.dig('ops_manager', 'openstack', 'connection_options')
127
+ }
130
128
  end
131
-
132
- private
133
-
134
- attr_reader :test_settings
135
129
  end
136
130
  end
137
131
  end
data/lib/ops_manager_ui_drivers/version16/settings.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  using OpsManagerUiDrivers::BackportRefinements
2
+
2
3
  module OpsManagerUiDrivers
3
4
  module Version16
4
5
  module Settings
@@ -22,23 +23,19 @@ module OpsManagerUiDrivers
22
23
 
23
24
  def iaas_configuration_fields
24
25
  {
25
- 'vcd_url' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'url'),
26
- 'organization' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'organization'),
27
- 'vcd_username' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'user'),
28
- 'vcd_password' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'password'),
29
- 'datacenter' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'name'),
30
- 'storage_profile' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'storage_profile'),
31
- 'catalog_name' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'catalog_name'),
26
+ 'vcd_url' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'url'),
27
+ 'organization' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'organization'),
28
+ 'vcd_username' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'user'),
29
+ 'vcd_password' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'password'),
30
+ 'datacenter' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'name'),
31
+ 'storage_profile' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'storage_profile'),
32
+ 'catalog_name' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'catalog_name'),
32
33
  }
33
34
  end
34
35
 
35
36
  def advanced_infrastructure_config_fields
36
37
  {}
37
38
  end
38
-
39
- private
40
-
41
- attr_reader :test_settings
42
39
  end
43
40
 
44
41
  class Vsphere
@@ -52,14 +49,14 @@ module OpsManagerUiDrivers
52
49
 
53
50
  def iaas_configuration_fields
54
51
  {
55
- 'vcenter_ip' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'ip'),
56
- 'vcenter_username' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'username'),
57
- 'vcenter_password' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'password'),
58
- 'datacenter' => test_settings.dig('ops_manager', 'vcenter', 'datacenter'),
59
- 'datastores_string' => test_settings.dig('ops_manager', 'vcenter', 'persistent_datastore'),
60
- 'bosh_vm_folder' => test_settings.dig('ops_manager', 'vcenter', 'bosh_vm_folder'),
61
- 'bosh_template_folder' => test_settings.dig('ops_manager', 'vcenter', 'bosh_template_folder'),
62
- 'bosh_disk_path' => test_settings.dig('ops_manager', 'vcenter', 'bosh_disk_path'),
52
+ 'vcenter_ip' => vcenter_ip(@test_settings),
53
+ 'vcenter_username' => @test_settings.dig('ops_manager', 'vcenter', 'creds', 'username'),
54
+ 'vcenter_password' => @test_settings.dig('ops_manager', 'vcenter', 'creds', 'password'),
55
+ 'datacenter' => @test_settings.dig('ops_manager', 'vcenter', 'datacenter'),
56
+ 'datastores_string' => @test_settings.dig('ops_manager', 'vcenter', 'persistent_datastore'),
57
+ 'bosh_vm_folder' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_vm_folder'),
58
+ 'bosh_template_folder' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_template_folder'),
59
+ 'bosh_disk_path' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_disk_path'),
63
60
  }
64
61
  end
65
62
 
@@ -69,7 +66,10 @@ module OpsManagerUiDrivers
69
66
 
70
67
  private
71
68
 
72
- attr_reader :test_settings
69
+ def vcenter_ip(test_settings)
70
+ test_settings.dig('ops_manager', 'vcenter', 'creds', 'ip') ||
71
+ test_settings.dig('ops_manager', 'vcenter', 'creds', 'host')
72
+ end
73
73
  end
74
74
 
75
75
  class AWS
@@ -83,24 +83,20 @@ module OpsManagerUiDrivers
83
83
 
84
84
  def iaas_configuration_fields
85
85
  {
86
- 'access_key_id' => test_settings.dig('ops_manager', 'aws', 'aws_access_key'),
87
- 'secret_access_key' => test_settings.dig('ops_manager', 'aws', 'aws_secret_key'),
88
- 'vpc_id' => test_settings.dig('ops_manager', 'aws', 'vpc_id'),
89
- 'security_group' => test_settings.dig('ops_manager', 'aws', 'security_group'),
90
- 'key_pair_name' => test_settings.dig('ops_manager', 'aws', 'key_pair_name'),
91
- 'ssh_private_key' => test_settings.dig('ops_manager', 'aws', 'ssh_key'),
92
- 'region' => test_settings.dig('ops_manager', 'aws', 'region'),
93
- 'encrypted' => test_settings.dig('ops_manager', 'aws', 'encrypt_disk'),
86
+ 'access_key_id' => @test_settings.dig('ops_manager', 'aws', 'aws_access_key'),
87
+ 'secret_access_key' => @test_settings.dig('ops_manager', 'aws', 'aws_secret_key'),
88
+ 'vpc_id' => @test_settings.dig('ops_manager', 'aws', 'vpc_id'),
89
+ 'security_group' => @test_settings.dig('ops_manager', 'aws', 'security_group'),
90
+ 'key_pair_name' => @test_settings.dig('ops_manager', 'aws', 'key_pair_name'),
91
+ 'ssh_private_key' => @test_settings.dig('ops_manager', 'aws', 'ssh_key'),
92
+ 'region' => @test_settings.dig('ops_manager', 'aws', 'region'),
93
+ 'encrypted' => @test_settings.dig('ops_manager', 'aws', 'encrypt_disk'),
94
94
  }
95
95
  end
96
96
 
97
97
  def advanced_infrastructure_config_fields
98
98
  {}
99
99
  end
100
-
101
- private
102
-
103
- attr_reader :test_settings
104
100
  end
105
101
 
106
102
  class OpenStack
@@ -114,25 +110,23 @@ module OpsManagerUiDrivers
114
110
 
115
111
  def iaas_configuration_fields
116
112
  {
117
- 'identity_endpoint' => test_settings.dig('ops_manager', 'openstack', 'identity_endpoint'),
118
- 'username' => test_settings.dig('ops_manager', 'openstack', 'username'),
119
- 'password' => test_settings.dig('ops_manager', 'openstack', 'password'),
120
- 'tenant' => test_settings.dig('ops_manager', 'openstack', 'tenant'),
121
- 'security_group' => test_settings.dig('ops_manager', 'openstack', 'security_group_name'),
122
- 'key_pair_name' => test_settings.dig('ops_manager', 'openstack', 'key_pair_name'),
123
- 'ssh_private_key' => test_settings.dig('ops_manager', 'openstack', 'ssh_private_key'),
124
- 'region' => test_settings.dig('ops_manager', 'openstack', 'region'),
125
- 'disable_dhcp' => test_settings.dig('ops_manager', 'openstack', 'disable_dhcp'),
113
+ 'identity_endpoint' => @test_settings.dig('ops_manager', 'openstack', 'identity_endpoint'),
114
+ 'username' => @test_settings.dig('ops_manager', 'openstack', 'username'),
115
+ 'password' => @test_settings.dig('ops_manager', 'openstack', 'password'),
116
+ 'tenant' => @test_settings.dig('ops_manager', 'openstack', 'tenant'),
117
+ 'security_group' => @test_settings.dig('ops_manager', 'openstack', 'security_group_name'),
118
+ 'key_pair_name' => @test_settings.dig('ops_manager', 'openstack', 'key_pair_name'),
119
+ 'ssh_private_key' => @test_settings.dig('ops_manager', 'openstack', 'ssh_private_key'),
120
+ 'region' => @test_settings.dig('ops_manager', 'openstack', 'region'),
121
+ 'disable_dhcp' => @test_settings.dig('ops_manager', 'openstack', 'disable_dhcp'),
126
122
  }
127
123
  end
128
124
 
129
125
  def advanced_infrastructure_config_fields
130
- {'connection_options' => test_settings.dig('ops_manager', 'openstack', 'connection_options')}
126
+ {
127
+ 'connection_options' => @test_settings.dig('ops_manager', 'openstack', 'connection_options')
128
+ }
131
129
  end
132
-
133
- private
134
-
135
- attr_reader :test_settings
136
130
  end
137
131
  end
138
132
  end
data/lib/ops_manager_ui_drivers/version17/settings.rb CHANGED
@@ -23,23 +23,19 @@ module OpsManagerUiDrivers
23
23
 
24
24
  def iaas_configuration_fields
25
25
  {
26
- 'vcd_url' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'url'),
27
- 'organization' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'organization'),
28
- 'vcd_username' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'user'),
29
- 'vcd_password' => test_settings.dig('ops_manager', 'vcloud', 'creds', 'password'),
30
- 'datacenter' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'name'),
31
- 'storage_profile' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'storage_profile'),
32
- 'catalog_name' => test_settings.dig('ops_manager', 'vcloud', 'vdc', 'catalog_name'),
26
+ 'vcd_url' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'url'),
27
+ 'organization' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'organization'),
28
+ 'vcd_username' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'user'),
29
+ 'vcd_password' => @test_settings.dig('ops_manager', 'vcloud', 'creds', 'password'),
30
+ 'datacenter' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'name'),
31
+ 'storage_profile' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'storage_profile'),
32
+ 'catalog_name' => @test_settings.dig('ops_manager', 'vcloud', 'vdc', 'catalog_name'),
33
33
  }
34
34
  end
35
35
 
36
36
  def advanced_infrastructure_config_fields
37
37
  {}
38
38
  end
39
-
40
- private
41
-
42
- attr_reader :test_settings
43
39
  end
44
40
 
45
41
  class Vsphere
@@ -53,15 +49,15 @@ module OpsManagerUiDrivers
53
49
 
54
50
  def iaas_configuration_fields
55
51
  {
56
- 'vcenter_ip' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'ip'),
57
- 'vcenter_username' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'username'),
58
- 'vcenter_password' => test_settings.dig('ops_manager', 'vcenter', 'creds', 'password'),
59
- 'datacenter' => test_settings.dig('ops_manager', 'vcenter', 'datacenter'),
60
- 'ephemeral_datastores_string' => test_settings.dig('ops_manager', 'vcenter', 'ephemeral_datastore'),
61
- 'persistent_datastores_string' => test_settings.dig('ops_manager', 'vcenter', 'persistent_datastore'),
62
- 'bosh_vm_folder' => test_settings.dig('ops_manager', 'vcenter', 'bosh_vm_folder'),
63
- 'bosh_template_folder' => test_settings.dig('ops_manager', 'vcenter', 'bosh_template_folder'),
64
- 'bosh_disk_path' => test_settings.dig('ops_manager', 'vcenter', 'bosh_disk_path'),
52
+ 'vcenter_host' => vcenter_host(@test_settings),
53
+ 'vcenter_username' => @test_settings.dig('ops_manager', 'vcenter', 'creds', 'username'),
54
+ 'vcenter_password' => @test_settings.dig('ops_manager', 'vcenter', 'creds', 'password'),
55
+ 'datacenter' => @test_settings.dig('ops_manager', 'vcenter', 'datacenter'),
56
+ 'ephemeral_datastores_string' => @test_settings.dig('ops_manager', 'vcenter', 'ephemeral_datastore'),
57
+ 'persistent_datastores_string' => @test_settings.dig('ops_manager', 'vcenter', 'persistent_datastore'),
58
+ 'bosh_vm_folder' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_vm_folder'),
59
+ 'bosh_template_folder' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_template_folder'),
60
+ 'bosh_disk_path' => @test_settings.dig('ops_manager', 'vcenter', 'bosh_disk_path'),
65
61
  }
66
62
  end
67
63
 
@@ -71,7 +67,10 @@ module OpsManagerUiDrivers
71
67
 
72
68
  private
73
69
 
74
- attr_reader :test_settings
70
+ def vcenter_host(test_settings)
71
+ test_settings.dig('ops_manager', 'vcenter', 'creds', 'host') ||
72
+ test_settings.dig('ops_manager', 'vcenter', 'creds', 'ip')
73
+ end
75
74
  end
76
75
 
77
76
  class AWS
@@ -85,24 +84,20 @@ module OpsManagerUiDrivers
85
84
 
86
85
  def iaas_configuration_fields
87
86
  {
88
- 'access_key_id' => test_settings.dig('ops_manager', 'aws', 'aws_access_key'),
89
- 'secret_access_key' => test_settings.dig('ops_manager', 'aws', 'aws_secret_key'),
90
- 'vpc_id' => test_settings.dig('ops_manager', 'aws', 'vpc_id'),
91
- 'security_group' => test_settings.dig('ops_manager', 'aws', 'security_group_id'),
92
- 'key_pair_name' => test_settings.dig('ops_manager', 'aws', 'key_pair_name'),
93
- 'ssh_private_key' => test_settings.dig('ops_manager', 'aws', 'ssh_key'),
94
- 'region' => test_settings.dig('ops_manager', 'aws', 'region'),
95
- 'encrypted' => test_settings.dig('ops_manager', 'aws', 'encrypt_disk'),
87
+ 'access_key_id' => @test_settings.dig('ops_manager', 'aws', 'aws_access_key'),
88
+ 'secret_access_key' => @test_settings.dig('ops_manager', 'aws', 'aws_secret_key'),
89
+ 'vpc_id' => @test_settings.dig('ops_manager', 'aws', 'vpc_id'),
90
+ 'security_group' => @test_settings.dig('ops_manager', 'aws', 'security_group_id'),
91
+ 'key_pair_name' => @test_settings.dig('ops_manager', 'aws', 'key_pair_name'),
92
+ 'ssh_private_key' => @test_settings.dig('ops_manager', 'aws', 'ssh_key'),
93
+ 'region' => @test_settings.dig('ops_manager', 'aws', 'region'),
94
+ 'encrypted' => @test_settings.dig('ops_manager', 'aws', 'encrypt_disk'),
96
95
  }
97
96
  end
98
97
 
99
98
  def advanced_infrastructure_config_fields
100
99
  {}
101
100
  end
102
-
103
- private
104
-
105
- attr_reader :test_settings
106
101
  end
107
102
 
108
103
  class OpenStack
@@ -116,25 +111,23 @@ module OpsManagerUiDrivers
116
111
 
117
112
  def iaas_configuration_fields
118
113
  {
119
- 'identity_endpoint' => test_settings.dig('ops_manager', 'openstack', 'identity_endpoint'),
120
- 'username' => test_settings.dig('ops_manager', 'openstack', 'username'),
121
- 'password' => test_settings.dig('ops_manager', 'openstack', 'password'),
122
- 'tenant' => test_settings.dig('ops_manager', 'openstack', 'tenant'),
123
- 'security_group' => test_settings.dig('ops_manager', 'openstack', 'security_group_name'),
124
- 'key_pair_name' => test_settings.dig('ops_manager', 'openstack', 'key_pair_name'),
125
- 'ssh_private_key' => test_settings.dig('ops_manager', 'openstack', 'ssh_private_key'),
126
- 'region' => test_settings.dig('ops_manager', 'openstack', 'region'),
127
- 'disable_dhcp' => test_settings.dig('ops_manager', 'openstack', 'disable_dhcp'),
114
+ 'identity_endpoint' => @test_settings.dig('ops_manager', 'openstack', 'identity_endpoint'),
115
+ 'username' => @test_settings.dig('ops_manager', 'openstack', 'username'),
116
+ 'password' => @test_settings.dig('ops_manager', 'openstack', 'password'),
117
+ 'tenant' => @test_settings.dig('ops_manager', 'openstack', 'tenant'),
118
+ 'security_group' => @test_settings.dig('ops_manager', 'openstack', 'security_group_name'),
119
+ 'key_pair_name' => @test_settings.dig('ops_manager', 'openstack', 'key_pair_name'),
120
+ 'ssh_private_key' => @test_settings.dig('ops_manager', 'openstack', 'ssh_private_key'),
121
+ 'region' => @test_settings.dig('ops_manager', 'openstack', 'region'),
122
+ 'disable_dhcp' => @test_settings.dig('ops_manager', 'openstack', 'disable_dhcp'),
128
123
  }
129
124
  end
130
125
 
131
126
  def advanced_infrastructure_config_fields
132
- {'connection_options' => test_settings.dig('ops_manager', 'openstack', 'connection_options')}
127
+ {
128
+ 'connection_options' => @test_settings.dig('ops_manager', 'openstack', 'connection_options')
129
+ }
133
130
  end
134
-
135
- private
136
-
137
- attr_reader :test_settings
138
131
  end
139
132
  end
140
133
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ops_manager_ui_drivers
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.2
4
+ version: 2.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pivotal, Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-02-10 00:00:00.000000000 Z
11
+ date: 2016-02-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport