j-enc 0.0.5 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/enc/builder.rb +11 -2
- data/lib/enc/collins_helper/node/node_asset.rb +2 -2
- data/lib/enc/version.rb +1 -1
- data/spec/builder_spec.rb +4 -1
- data/spec/node_asset_spec.rb +2 -2
- data/spec/support/utils.rb +3 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 44582a9e44b82e6f3eb39499fdea2301e28825e1
|
4
|
+
data.tar.gz: a6721033a7fc4f6ec1a0b4f42c7148900008fed0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 609a5d2d508e75a3cceb6f97eae2208b1d6a41b4f83ffe8996de6e844042766804fdadb00b231965ed0b4bc065772edfa26012003e26b5bd53a37a27da2421bc
|
7
|
+
data.tar.gz: 772bd9ce7407bf5567a07c239694da61fc2fdfb411cde3b21b79769cb0eddd92c800dd77c405ec1ae3018e47e4b291340994718fa05eb0830dee87b3b9525fb3
|
data/lib/enc/builder.rb
CHANGED
@@ -20,9 +20,18 @@ module Enc
|
|
20
20
|
end
|
21
21
|
|
22
22
|
# It's not strictly necessary, but nice to have the $collins parameter at the end of the output.
|
23
|
-
output['parameters']['collins'] =
|
23
|
+
output['parameters']['collins'] = get_asset_extras.merge!(get_asset_attributes)
|
24
24
|
output.to_yaml
|
25
25
|
end
|
26
26
|
|
27
|
+
def get_asset_extras
|
28
|
+
{'TAG' => @asset.tag,
|
29
|
+
'STATE' => @asset.state.name,
|
30
|
+
'STATUS' => @asset.status}
|
31
|
+
end
|
32
|
+
|
33
|
+
def get_asset_attributes
|
34
|
+
@asset.get_flattened_attributes
|
35
|
+
end
|
27
36
|
end
|
28
|
-
end
|
37
|
+
end
|
@@ -76,9 +76,9 @@ module Enc
|
|
76
76
|
|
77
77
|
def get_datacenter
|
78
78
|
begin
|
79
|
-
value = get_safe_attribute('
|
79
|
+
value = get_safe_attribute('DATA_CENTER')
|
80
80
|
rescue KeyError
|
81
|
-
raise NoDatacenter, 'The node does not have a
|
81
|
+
raise NoDatacenter, 'The node does not have a data_center tag set'
|
82
82
|
end
|
83
83
|
value
|
84
84
|
end
|
data/lib/enc/version.rb
CHANGED
data/spec/builder_spec.rb
CHANGED
@@ -28,7 +28,10 @@ describe 'ENC Builder' do
|
|
28
28
|
expect(YAML.load(builder.to_yaml)['parameters']['role1']).to eq(node.get_roles_by_index[0])
|
29
29
|
expect(YAML.load(builder.to_yaml)['parameters']['role2']).to eq(node.get_roles_by_index[1])
|
30
30
|
expect(YAML.load(builder.to_yaml)['parameters']['role3']).to eq(node.get_roles_by_index[2])
|
31
|
-
expect(YAML.load(builder.to_yaml)['parameters']['collins']).to eq(node.
|
31
|
+
expect(YAML.load(builder.to_yaml)['parameters']['collins']).to eq({'TAG' => node.tag,
|
32
|
+
'STATE' => node.state.name,
|
33
|
+
'STATUS' => node.status}.
|
34
|
+
merge!(node.get_flattened_attributes))
|
32
35
|
expect(YAML.load(builder.to_yaml)['parameters']['collins']['HOSTNAME']).to eq(node.get_hostname)
|
33
36
|
end
|
34
37
|
|
data/spec/node_asset_spec.rb
CHANGED
@@ -35,7 +35,7 @@ describe 'Collins Node Asset' do
|
|
35
35
|
node = FactoryGirl.build(:node_asset, datacenter: nil)
|
36
36
|
expect(node.is_valid?).to eq(false)
|
37
37
|
expect{node.get_datacenter}.to raise_exception(Enc::CollinsHelper::Node::NoDatacenter,
|
38
|
-
'The node does not have a
|
38
|
+
'The node does not have a data_center tag set')
|
39
39
|
end
|
40
40
|
|
41
41
|
it 'is not a valid asset due to missing deployment environment' do
|
@@ -51,4 +51,4 @@ describe 'Collins Node Asset' do
|
|
51
51
|
expect{node.get_hostname}.to raise_exception(Enc::CollinsHelper::Node::NoHostname,
|
52
52
|
'The node does not have a hostname tag set')
|
53
53
|
end
|
54
|
-
end
|
54
|
+
end
|
data/spec/support/utils.rb
CHANGED
@@ -9,6 +9,8 @@ module Utils
|
|
9
9
|
'NAME' => 'RUNNING',
|
10
10
|
'LABEL' => 'Running',
|
11
11
|
'DESCRIPTION' => 'A service in this state is operational.' },
|
12
|
+
'STATUS' => 'Allocated',
|
13
|
+
'TYPE' => 'SERVER_NODE',
|
12
14
|
'DISK' => [],
|
13
15
|
'BASE' => { 'DESCRIPTION' => '',
|
14
16
|
'PRODUCT' => '',
|
@@ -20,7 +22,7 @@ module Utils
|
|
20
22
|
'ATTRIBS' => { '2' => { 'CONFIGURATION_ROLES' => 'puppet-master-dev' },
|
21
23
|
'1' => { 'CONFIGURATION_ROLES' => 'fpm' },
|
22
24
|
'0' => { 'HOSTNAME' => hostname,
|
23
|
-
'
|
25
|
+
'DATA_CENTER' => datacenter,
|
24
26
|
'PUPPET_ENC' => puppet_enc,
|
25
27
|
'DESCRIPTION' => 'Test_server',
|
26
28
|
'PRIMARY_ROLE' => 'Infrastructure',
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: j-enc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jestin Woods
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2015-01-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
168
168
|
version: '0'
|
169
169
|
requirements: []
|
170
170
|
rubyforge_project:
|
171
|
-
rubygems_version: 2.
|
171
|
+
rubygems_version: 2.4.3
|
172
172
|
signing_key:
|
173
173
|
specification_version: 4
|
174
174
|
summary: Puppet ENC using Collins.
|