projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
delete juju model when some VCA has been deployed
[osm/LCM.git]
/
osm_lcm
/
lcm.py
diff --git
a/osm_lcm/lcm.py
b/osm_lcm/lcm.py
index
8cd15e8
..
b306720
100644
(file)
--- a/
osm_lcm/lcm.py
+++ b/
osm_lcm/lcm.py
@@
-34,7
+34,7
@@
from osm_lcm import vim_sdn
from osm_lcm import netslice
from osm_lcm import ROclient
from osm_lcm import netslice
from osm_lcm import ROclient
-from time import time
, sleep
+from time import time
from osm_lcm.lcm_utils import versiontuple, LcmException, TaskRegistry, LcmExceptionExit
from osm_lcm import version as lcm_version, version_date as lcm_version_date
from osm_lcm.lcm_utils import versiontuple, LcmException, TaskRegistry, LcmExceptionExit
from osm_lcm import version as lcm_version, version_date as lcm_version_date
@@
-286,6
+286,10
@@
class Lcm:
except Exception as e:
self.logger.error("Cannot write into '{}' for healthcheck: {}".format(health_check_file, e))
return
except Exception as e:
self.logger.error("Cannot write into '{}' for healthcheck: {}".format(health_check_file, e))
return
+ elif topic == "pla":
+ if command == "placement":
+ self.ns.update_nsrs_with_pla_result(params)
+ return
elif topic == "k8scluster":
if command == "create" or command == "created":
k8scluster_id = params.get("_id")
elif topic == "k8scluster":
if command == "create" or command == "created":
k8scluster_id = params.get("_id")
@@
-463,7
+467,7
@@
class Lcm:
self.first_start = True
while self.consecutive_errors < 10:
try:
self.first_start = True
while self.consecutive_errors < 10:
try:
- topics = ("ns", "vim_account", "wim_account", "sdn", "nsi", "k8scluster", "k8srepo")
+ topics = ("ns", "vim_account", "wim_account", "sdn", "nsi", "k8scluster", "k8srepo"
, "pla"
)
topics_admin = ("admin", )
await asyncio.gather(
self.msg.aioread(topics, self.loop, self.kafka_read_callback),
topics_admin = ("admin", )
await asyncio.gather(
self.msg.aioread(topics, self.loop, self.kafka_read_callback),
@@
-604,27
+608,10
@@
def usage():
# --log-socket-port PORT: send logs using this port (default: 9022)")
# --log-socket-port PORT: send logs using this port (default: 9022)")
-def health_check():
- retry = 2
- while retry:
- retry -= 1
- try:
- with open(health_check_file, "r") as f:
- last_received_ping = f.read()
-
- if time() - float(last_received_ping) < Lcm.ping_interval_pace + 10:
- exit(0)
- except Exception:
- pass
- if retry:
- sleep(6)
- exit(1)
-
-
if __name__ == '__main__':
try:
if __name__ == '__main__':
try:
- print("SYS.PATH='{}'".format(sys.path))
+
#
print("SYS.PATH='{}'".format(sys.path))
# load parameters and configuration
# -h
# -c value
# load parameters and configuration
# -h
# -c value
@@
-641,7
+628,8
@@
if __name__ == '__main__':
elif o in ("-c", "--config"):
config_file = a
elif o == "--health-check":
elif o in ("-c", "--config"):
config_file = a
elif o == "--health-check":
- health_check()
+ from osm_lcm.lcm_hc import health_check
+ health_check(health_check_file, Lcm.ping_interval_pace)
# elif o == "--log-socket-port":
# log_socket_port = a
# elif o == "--log-socket-host":
# elif o == "--log-socket-port":
# log_socket_port = a
# elif o == "--log-socket-host":