projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1939 fixed: : added a random suffix to the end of the Juju app name, in order...
[osm/N2VC.git]
/
n2vc
/
n2vc_juju_conn.py
diff --git
a/n2vc/n2vc_juju_conn.py
b/n2vc/n2vc_juju_conn.py
index
55220d6
..
4efbd1c
100644
(file)
--- a/
n2vc/n2vc_juju_conn.py
+++ b/
n2vc/n2vc_juju_conn.py
@@
-39,7
+39,7
@@
from n2vc.n2vc_conn import N2VCConnector
from n2vc.n2vc_conn import obj_to_dict, obj_to_yaml
from n2vc.libjuju import Libjuju
from n2vc.store import MotorStore
from n2vc.n2vc_conn import obj_to_dict, obj_to_yaml
from n2vc.libjuju import Libjuju
from n2vc.store import MotorStore
-from n2vc.utils import get_ee_id_components
+from n2vc.utils import get_ee_id_components
, generate_random_alfanum_string
from n2vc.vca.connection import get_connection
from retrying_async import retry
from n2vc.vca.connection import get_connection
from retrying_async import retry
@@
-1140,7
+1140,7
@@
class N2VCJujuConnector(N2VCConnector):
"""
Build application name from namespace
:param namespace:
"""
Build application name from namespace
:param namespace:
- :return: app-vnf-<vnf id>-vdu-<vdu-id>-cnt-<vdu-count>
+ :return: app-vnf-<vnf id>-vdu-<vdu-id>-cnt-<vdu-count>
-<random_value>
"""
# TODO: Enforce the Juju 50-character application limit
"""
# TODO: Enforce the Juju 50-character application limit
@@
-1167,7
+1167,12
@@
class N2VCJujuConnector(N2VCConnector):
else:
vdu_count = "-cnt-" + vdu_count
else:
vdu_count = "-cnt-" + vdu_count
- application_name = "app-{}{}{}".format(vnf_id, vdu_id, vdu_count)
+ # Generate a random suffix with 5 characters (the default size used by K8s)
+ random_suffix = generate_random_alfanum_string(size=5)
+
+ application_name = "app-{}{}{}-{}".format(
+ vnf_id, vdu_id, vdu_count, random_suffix
+ )
return N2VCJujuConnector._format_app_name(application_name)
return N2VCJujuConnector._format_app_name(application_name)