projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removal of openvim
[osm/devops.git]
/
installers
/
charm
/
pla
/
src
/
charm.py
diff --git
a/installers/charm/pla/src/charm.py
b/installers/charm/pla/src/charm.py
index
4f463bf
..
d9dfaa4
100755
(executable)
--- a/
installers/charm/pla/src/charm.py
+++ b/
installers/charm/pla/src/charm.py
@@
-24,24
+24,17
@@
import logging
import logging
-from typing import NoReturn
+from typing import NoReturn
, Optional
from ops.main import main
from ops.main import main
-
from opslib.osm.charm import CharmedOsmBase, RelationsMissing
from opslib.osm.charm import CharmedOsmBase, RelationsMissing
-
+from opslib.osm.interfaces.kafka import KafkaClient
+from opslib.osm.interfaces.mongo import MongoClient
from opslib.osm.pod import (
ContainerV3Builder,
PodSpecV3Builder,
)
from opslib.osm.pod import (
ContainerV3Builder,
PodSpecV3Builder,
)
-
-from opslib.osm.validator import (
- ModelValidator,
- validator,
-)
-
-from opslib.osm.interfaces.kafka import KafkaClient
-from opslib.osm.interfaces.mongo import MongoClient
+from opslib.osm.validator import ModelValidator, validator
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
@@
-51,6
+44,7
@@
PORT = 9999
class ConfigModel(ModelValidator):
database_commonkey: str
class ConfigModel(ModelValidator):
database_commonkey: str
+ mongodb_uri: Optional[str]
log_level: str
@validator("log_level")
log_level: str
@validator("log_level")
@@
-59,6
+53,12
@@
class ConfigModel(ModelValidator):
raise ValueError("value must be INFO or DEBUG")
return v
raise ValueError("value must be INFO or DEBUG")
return v
+ @validator("mongodb_uri")
+ def validate_mongodb_uri(cls, v):
+ if v and not v.startswith("mongodb://"):
+ raise ValueError("mongodb_uri is not properly formed")
+ return v
+
class PlaCharm(CharmedOsmBase):
def __init__(self, *args) -> NoReturn:
class PlaCharm(CharmedOsmBase):
def __init__(self, *args) -> NoReturn:
@@
-77,7
+77,7
@@
class PlaCharm(CharmedOsmBase):
if self.kafka_client.is_missing_data_in_unit():
missing_relations.append("kafka")
if self.kafka_client.is_missing_data_in_unit():
missing_relations.append("kafka")
- if self.mongodb_client.is_missing_data_in_unit():
+ if
not config.mongodb_uri and
self.mongodb_client.is_missing_data_in_unit():
missing_relations.append("mongodb")
if missing_relations:
missing_relations.append("mongodb")
if missing_relations:
@@
-86,10
+86,16
@@
class PlaCharm(CharmedOsmBase):
def build_pod_spec(self, image_info):
# Validate config
config = ConfigModel(**dict(self.config))
def build_pod_spec(self, image_info):
# Validate config
config = ConfigModel(**dict(self.config))
+
+ if config.mongodb_uri and not self.mongodb_client.is_missing_data_in_unit():
+ raise Exception("Mongodb data cannot be provided via config and relation")
+
# Check relations
self._check_missing_dependencies(config)
# Check relations
self._check_missing_dependencies(config)
+
# Create Builder for the PodSpec
pod_spec_builder = PodSpecV3Builder()
# Create Builder for the PodSpec
pod_spec_builder = PodSpecV3Builder()
+
# Build Container
container_builder = ContainerV3Builder(self.app.name, image_info)
container_builder.add_port(name=self.app.name, port=PORT)
# Build Container
container_builder = ContainerV3Builder(self.app.name, image_info)
container_builder.add_port(name=self.app.name, port=PORT)
@@
-104,14
+110,17
@@
class PlaCharm(CharmedOsmBase):
"OSMPLA_MESSAGE_PORT": self.kafka_client.port,
# Database configuration
"OSMPLA_DATABASE_DRIVER": "mongo",
"OSMPLA_MESSAGE_PORT": self.kafka_client.port,
# Database configuration
"OSMPLA_DATABASE_DRIVER": "mongo",
- "OSMPLA_DATABASE_URI": self.mongodb_client.connection_string,
+ "OSMPLA_DATABASE_URI": config.mongodb_uri
+ or self.mongodb_client.connection_string,
"OSMPLA_DATABASE_COMMONKEY": config.database_commonkey,
}
)
container = container_builder.build()
"OSMPLA_DATABASE_COMMONKEY": config.database_commonkey,
}
)
container = container_builder.build()
+
# Add container to pod spec
pod_spec_builder.add_container(container)
# Add container to pod spec
pod_spec_builder.add_container(container)
+
return pod_spec_builder.build()
return pod_spec_builder.build()