Merge pull request #50 from cyclecomputing/feature/aws-support

Filter out unneeded status lines for AWS instances

Author: todddeluca

tests/test_vagrant.py

@@ -197,6 +197,35 @@ def test_parse_status():
     assert goal == parsed, 'The parsing of the test listing did not match the goal.\nlisting={!r}\ngoal={!r}\nparsed_listing={!r}'.format(listing, goal, parsed)
 
 
+@with_setup(make_setup_vm(), teardown_vm)
+def test_parse_aws_status():
+    '''
+    Test the parsing the output of the `vagrant status` command for an aws instance.
+    '''
+    listing = '''1462351212,default,action,read_state,start
+1462351214,default,action,read_state,end
+1462351214,default,metadata,provider,aws
+1462351214,default,action,read_state,start
+1462351215,default,action,read_state,end
+1462351215,default,action,read_state,start
+1462351216,default,action,read_state,end
+1462351216,default,action,read_state,start
+1462351217,default,action,read_state,end
+1462351217,default,provider-name,aws
+1462351217,default,state,running
+1462351217,default,state-human-short,running
+1462351217,default,state-human-long,The EC2 instance is running. To stop this machine%!(VAGRANT_COMMA) you can run\\n`vagrant halt`. To destroy the machine%!(VAGRANT_COMMA) you can run `vagrant destroy`.
+1462351217,default,action,read_state,start
+1462351219,default,action,read_state,end
+1462351219,,ui,info,Current machine states:\\n\\ndefault (aws)\\n\\nThe EC2 instance is running. To stop this machine%!(VAGRANT_COMMA) you can run\\n`vagrant halt`. To destroy the machine%!(VAGRANT_COMMA) you can run `vagrant destroy`.
+'''
+    # Can compare tuples to Status class b/c Status is a collections.namedtuple.
+    goal = [('default', 'running', 'aws')]
+    v = vagrant.Vagrant(TD)
+    parsed = v._parse_status(listing)
+    assert goal == parsed, 'The parsing of the test listing did not match the goal.\nlisting={!r}\ngoal={!r}\nparsed_listing={!r}'.format(listing, goal, parsed)
+
+
 @with_setup(make_setup_vm(), teardown_vm)
 def test_vm_status():
     '''

vagrant/__init__.py

@@ -852,7 +852,7 @@ def _parse_machine_readable_output(self, output):
         # vagrant 1.8 adds additional fields that aren't required,
         # and will break parsing if included in the status lines.
         # filter them out pending future implementation.
-        parsed_lines = list(filter(lambda x: x[2] != "metadata" and x[2] != "ui", parsed_lines))
+        parsed_lines = list(filter(lambda x: x[2] not in ["metadata", "ui", "action"], parsed_lines))
         return parsed_lines
 
     def _parse_config(self, ssh_config):