tests passing

a5huynh · Feb 11, 2016 · 5721791 · 5721791
1 parent de378a6
commit 5721791
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/__pycache__/sidekick.cpython-35.pyc b/__pycache__/sidekick.cpython-35.pyc
diff --git a/sidekick.py b/sidekick.py
@@ -80,12 +80,12 @@
 parser.add_argument( '--type', action='store', default='http',
                     help='type for Vulcand')
 
-def announce_services( services, etcd_folder, etcd_client, timeout , ttl):
+def announce_services( services, etcd_folder, etcd_client, timeout , ttl, vulcand):
     for key, value in services:
         logger.info( 'Health check for {}'.format( key ) )
         healthy = check_health( value )
 
-        if value['vulcand']:
+        if vulcand:
             backend = "/vulcand/backends/"+key+"/backend"
             server = "/vulcand/backends/"+key+"/servers/srv1"
             frontend = "/vulcand/frontends/"+key+"/frontend"
@@ -189,7 +189,7 @@ def find_matching_container( containers, args ):
             port = port[ 'PublicPort' ]
 
             if args.vulcand:
-                matching[args.name] = { 'ip': args.ip, 'port': port, 'domain': args.domain, 'vulcand': args.vulcand, 'type': args.type}
+                matching[args.name] = { 'ip': args.ip, 'port': port, 'domain': args.domain, 'type': args.type}
             else:
                 # Create a UUID
                 m = hashlib.md5()
@@ -243,7 +243,8 @@ def main():
                            etcd_folder,
                            etcd_client,
                            args.timeout,
-                           args.ttl, )
+                           args.ttl,
+                           args.vulcand )
 
 if __name__ == '__main__':
     main()
diff --git a/tests/__pycache__/__init__.cpython-35.pyc b/tests/__pycache__/__init__.cpython-35.pyc
diff --git a/tests/__pycache__/test_sidekick.cpython-35-PYTEST.pyc b/tests/__pycache__/test_sidekick.cpython-35-PYTEST.pyc
diff --git a/tests/test_sidekick.py b/tests/test_sidekick.py
@@ -11,7 +11,7 @@
 from sidekick import check_health, public_ports
 
 # Used to test command line arguments
-Args = namedtuple('Args', ['name', 'ip', 'check_ip'])
+Args = namedtuple('Args', ['name', 'ip', 'check_ip', 'vulcand'])
 
 
 class MockEtcd( object ):
@@ -26,7 +26,7 @@ class TestSidekick( unittest.TestCase ):
 
     def setUp( self ):
 
-        self.args = Args( name='test', ip='localhost', check_ip='0.0.0.0' )
+        self.args = Args( name='test', ip='localhost', check_ip='0.0.0.0', vulcand=False )
 
         self.etcd_client  = MockEtcd()
 
@@ -48,7 +48,8 @@ def setUp( self ):
     def test_announce_services( self ):
         ''' Test `announce_services` functionality '''
         services = find_matching_container( [self.container], self.args )
-        announce_services( services.items(), 'test', self.etcd_client, 0, 0 )
+        print(services)
+        announce_services( services.items(), 'test', self.etcd_client, 0, 0, False )
 
     def test_check_health( self ):
         ''' Test `check_health` functionality '''