hostname parsing fixed for groups

grimmpp · Dec 10, 2019 · 491be17 · 491be17
1 parent a5a2b23
commit 491be17
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Group.js b/Group.js
@@ -58,10 +58,7 @@ class Group {
             if (Group.hasHosts(groupName)) {
                 // add hostnames
                 for(var hostname in hostsIni[groupName]) {
-                    // check if hostname is valid
-                    if (Group.isValidHostname(hostname)) {
-                        groupList[_groupName].hostnames.push(hostname)
-                    }
+                    groupList[_groupName].hostnames.push(hostname.split(' ')[0])
                 }
             }
             else if (Group.hasSubgroups(groupName)) {

diff --git a/TreeBuilder.js b/TreeBuilder.js
@@ -20,11 +20,13 @@ class TreeBuilder {
             var subnode = TreeBuilder._internal_cloneObject(TreeBuilder._internal_findSubnode(flatGroupList, node.inventory, node.subgroups[i]))
 
             TreeBuilder.internal_addSubgroupsToNode(flatGroupList, flatHostList, subnode)
+            subnode.variables = Object.assign(subnode.variables, node.variables)
             node.nodes.push(subnode)
         }
 
         for (var i in node.hostnames) {
             var host = TreeBuilder._internal_cloneObject(TreeBuilder._internal_findSubnode(flatHostList, node.inventory, node.hostnames[i]))
+            host.variables = Object.assign(host.variables, node.variables)
             node.nodes.push(host)
         }
     }

diff --git a/test/inventoryTest.js b/test/inventoryTest.js
@@ -166,6 +166,8 @@ describe('#inventoryTest()', function() {
         for(var i in groupnames) {
             expect( groups.map(g => g.name).includes(groupnames[i]) ).to.be.true
         }
+        expect( groups.find(g => g.name == 'atlanta').hostnames.includes('host1') ).to.be.true
+        expect( groups.find(g => g.name == 'atlanta').hostnames.includes('host2') ).to.be.true
 
         const emptySubgroups = ['atlanta', 'raleigh', 'northeast', 'southwest', 'northwest', 'ungrouped']
         for(var i in emptySubgroups) {