fix import when calling ezmomi binary

Author: snobear

MANIFEST

@@ -0,0 +1,9 @@
+LICENSE.txt
+requirements.txt
+setup.py
+bin/ezmomi
+ezmomi/__init__.py
+ezmomi/cli.py
+ezmomi/ezmomi.py
+ezmomi/params.py
+ezmomi/config/config.yml.example

bin/ezmomi

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 from ezmomi import cli
 if __name__ == '__main__':
-    cli()
+    cli.cli()

ezmomi/cli.py

@@ -1,10 +1,9 @@
+'''
+ Command line definitions for ezmomi
+'''
 import argparse
 from params import add_params
 
-
-'''
- Start 'er up
-'''
 def cli():
     # Set up command line arguments
     parser = argparse.ArgumentParser(description='Perform common vSphere API tasks')

ezmomi/ezmomi.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 from pyVim.connect import SmartConnect, Disconnect
 from pyVmomi import vim, vmodl
 import atexit
@@ -11,10 +12,6 @@
 import yaml
 import logging
 from netaddr import IPNetwork, IPAddress
-<<<<<<< HEAD:ezmomi/ezmomi.py
-=======
-from params import add_params
->>>>>>> 4a40ac7d460bdbb1402989e35540ecb57df4f881:ezmomi.py
 
 '''
 Logging
@@ -314,33 +311,3 @@ def WaitTask(self, task, actionName='job', hideResult=False):
            raise task.info.error
 
         return task.info.result
-<<<<<<< HEAD:ezmomi/ezmomi.py
-=======
-
-'''
- Ye Olde Main
-'''
-if __name__ == '__main__':
-    # Set up command line arguments
-    parser = argparse.ArgumentParser(description='Perform common vSphere API tasks')
-    subparsers = parser.add_subparsers(help='Command', dest='mode')
-
-    # set up each command section
-    add_params(subparsers)
-
-    # parse arguments
-    args = parser.parse_args()
-
-    # initialize ezmomi instance
-    ez = EZMomi(**vars(args))
-    
-    kwargs = vars(args)
-    
-    # choose your adventure
-    if kwargs['mode'] == 'list':
-        ez.list_objects()
-    elif kwargs['mode'] == 'clone':
-        ez.clone()
-    elif kwargs['mode'] == 'destroy':
-        ez.destroy()
->>>>>>> 4a40ac7d460bdbb1402989e35540ecb57df4f881:ezmomi.py