X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vpe-router%2Freactive%2Fvpe_router.py;h=e2be32767c6dc50d3f513c70cdef43111f00e352;hb=411539d75681830856be9af6ae87453f639c4712;hp=c62983d860a5b635ad120d87ad0a2575017e2ae4;hpb=ccb1c133ce7f529d1f0d6d3e2eaf879f9742e879;p=osm%2Fdevops.git

diff --git a/vpe-router/reactive/vpe_router.py b/vpe-router/reactive/vpe_router.py
index c62983d8..e2be3276 100644
--- a/vpe-router/reactive/vpe_router.py
+++ b/vpe-router/reactive/vpe_router.py
@@ -39,6 +39,8 @@ def validate_config():
                 out, err = router.ssh(['whoami'], routerip,
                                       user, passwd)
                 if out.strip() != user:
+                    remove_state('vpe.configured')
+                    status_set('blocked', 'vpe is not configured')
                     raise Exception('invalid credentials')
 
                 # Set the router's hostname
@@ -56,15 +58,18 @@ def validate_config():
                                                ],
                                               routerip,
                                               user, passwd)
-
+                        set_state('vpe.configured')
+                        status_set('active', 'ready!')
+                    else:
+                        remove_state('vpe.configured')
+                        status_set('blocked', 'vpe is not configured')
                 except subprocess.CalledProcessError as e:
+                    remove_state('vpe.configured')
+                    status_set('blocked', 'validation failed: %s' % e)
                     log('Command failed: %s (%s)' %
                         (' '.join(e.cmd), str(e.output)))
                     raise
 
-        set_state('vpe.configured')
-        status_set('active', 'ready!')
-
     except Exception as e:
         log(repr(e))
         remove_state('vpe.configured')