X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Ftest%2Flaunchpad.py;h=98680ba523ca2472063c03893bf49d39e767e1ac;hb=90c193a4eeb12bb50f4be33b167036954a6c7546;hp=c9e471e84ec7609b7ffe4c23c69f5713e2f05850;hpb=6364d016e7f819903ff29a2ce160cb4cea61bf8f;p=osm%2FSO.git diff --git a/rwlaunchpad/test/launchpad.py b/rwlaunchpad/test/launchpad.py index c9e471e8..98680ba5 100755 --- a/rwlaunchpad/test/launchpad.py +++ b/rwlaunchpad/test/launchpad.py @@ -445,7 +445,7 @@ class Demo(rift.vcs.demo.Demo): restart_procs = [ VnfmTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore), VnsTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore), - MonitorTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore), + # MonitorTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore), MonitoringParameterTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore), NsmTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore), ResMgrTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore), @@ -572,9 +572,17 @@ def main(argv=sys.argv[1:]): northbound_listing="cli_launchpad_schema_listing.txt", netconf_trace_override=True) - confd_ip = socket.gethostbyname(socket.gethostname()) + # Search for externally accessible IP address with netifaces + gateways = netifaces.gateways() + # Check for default route facing interface and then get its ip address + if 'default' in gateways: + interface = gateways['default'][netifaces.AF_INET][1] + confd_ip = netifaces.ifaddresses(interface)[netifaces.AF_INET][0]['addr'] + else: + # no default gateway. Revert to 127.0.0.1 + confd_ip = "127.0.0.1" # TODO: This need to be changed when launchpad starts running on multiple VMs - rift.vcs.logger.configure_sink(config_file=None, confd_ip="127.0.0.1") + rift.vcs.logger.configure_sink(config_file=None, confd_ip=confd_ip) # Start the prepared system system.start()