Merge pull request #114 from fabric-testbed/doc-tag-log

Issues identified during network tests

Author: kthare10

Dockerfile-auth

@@ -1,19 +1,22 @@
 FROM python:3.9.0
 MAINTAINER Komal Thareja<[email protected]>
 
+HANDLERS_VER=1.0rc2
+
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 VOLUME ["/usr/src/app"]
 
 EXPOSE 11000
 
-COPY . /usr/src/app/
+COPY requirements.txt /usr/src/app/
+COPY fabric_cf /usr/src/app/fabric_cf
 RUN pip3 install --no-cache-dir -r requirements.txt
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"
 RUN mkdir -p "/var/log/actor"
 RUN cp /usr/local/lib/python3.9/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
-RUN pip3 install fabric-am-handlers==1.0rc1
+RUN pip3 install fabric-am-handlers==HANDLERS_VER
 
 ENTRYPOINT ["python3"]
 CMD ["-m", "fabric_cf.authority"]

Dockerfile-broker

@@ -7,7 +7,8 @@ VOLUME ["/usr/src/app"]
 
 EXPOSE 11000
 
-COPY . /usr/src/app/
+COPY requirements.txt /usr/src/app/
+COPY fabric_cf /usr/src/app/fabric_cf
 RUN pip3 install --no-cache-dir -r requirements.txt
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"

Dockerfile-cf

@@ -7,7 +7,8 @@ VOLUME ["/usr/src/app"]
 
 EXPOSE 11000
 
-COPY . /usr/src/app/
+COPY requirements.txt /usr/src/app/
+COPY fabric_cf /usr/src/app/fabric_cf
 RUN pip3 install --no-cache-dir -r requirements.txt
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"

Dockerfile-orchestrator

@@ -8,7 +8,8 @@ VOLUME ["/usr/src/app"]
 EXPOSE 11000
 EXPOSE 8700
 
-COPY . /usr/src/app/
+COPY requirements.txt /usr/src/app/
+COPY fabric_cf /usr/src/app/fabric_cf
 RUN pip3 install --no-cache-dir -r requirements.txt
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"

README.md

@@ -18,10 +18,14 @@ Broker is an agent of CF that collects resource availability information from mu
 AM is a CF agent responsible for managing aggregate resources. Is under the control of the owner of the aggregate. Provides promises of resources to brokers and controllers/ orchestrators. More details can be found [here](fabric_cf/authority/Readme.md)
 
 ## Orchestrator
-Orchestrator is an agent of CF that makes allocation decisions (embedding) of user requests into available resources. Communicates with user to collect slice requests, communicates with broker or aggregate managers to collect resource promises, communicates with aggregate managers to provision promised resources. Creates slices, configures resources, maintains their state, modifies slices and slivers. More details can be found [here](fabric_cf/orchestrator/Readme.md)  
+Orchestrator is an agent of CF that makes allocation decisions (embedding) of user requests into available resources. Communicates with user to collect slice requests, communicates with broker or aggregate managers to collect resource promises, communicates with aggregate managers to provision promised resources. Creates slices, configures resources, maintains their state, modifies slices and slivers. More details can be found [here](fabric_cf/orchestrator/README.md)
+
+## Architecture
+The following diagram depicts an overall architecture for the Control Framework.
+![Architecture](./images/cf.png)
 
 ## Requirements
-Python 3.7+
+Python 3.9+
 
 ## Build Docker Images
 

fabric_cf/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.0rc2"
+__VERSION__ = "1.0rc3"

fabric_cf/actor/boot/configuration.py

@@ -398,6 +398,12 @@ def get_global_config(self) -> GlobalConfig:
         """
         return self.global_config
 
+    def get_log_config(self) -> dict:
+        """
+        Return Log config
+        """
+        return self.global_config.get_logging()
+
     def get_runtime_config(self) -> dict:
         """
         Return Runtime Config

fabric_cf/actor/core/common/constants.py

@@ -274,3 +274,5 @@ class Constants:
     DEFAULT_VLAN_OFFSET = 10
     VLAN_START = 1
     VLAN_END = 4096
+
+    CONFIG_PROPERTIES_FILE = "config.properties.file"

fabric_cf/actor/core/container/globals.py

@@ -69,22 +69,21 @@ def __init__(self):
         self.lock = threading.Lock()
         self.jwt_validator = None
 
-    def make_logger(self):
+    def make_logger(self, *, log_config: dict = None):
         """
         Detects the path and level for the log file from the actor config and sets
         up a logger. Instead of detecting the path and/or level from the
         config, a custom path and/or level for the log file can be passed as
         optional arguments.
 
-       :param log_path: Path to custom log file
-       :param log_level: Custom log level
+       :param log_config: Log config
        :return: logging.Logger object
         """
+        if log_config is None:
+            if self.config is None:
+                raise RuntimeError('No config information available')
 
-        # Get the log path
-        if self.config is None:
-            raise RuntimeError('No config information available')
-        log_config = self.config.get_global_config().get_logging()
+            log_config = self.config.get_global_config().get_logging()
         if log_config is None:
             raise RuntimeError('No logging  config information available')
 
@@ -198,6 +197,13 @@ def get_config(self) -> Configuration:
             raise InitializationException(Constants.UNINITIALIZED_STATE)
         return self.config
 
+    def get_log_config(self) -> dict:
+        """
+        Get the Log configuration
+        @return dict
+        """
+        return self.get_config().get_log_config()
+
     def get_kafka_config_admin_client(self) -> dict:
         """
         Get Kafka Config Admin Client

fabric_cf/actor/core/plugins/handlers/ansible_handler_processor.py

@@ -48,6 +48,8 @@ def __init__(self):
         self.thread = None
         self.future_lock = threading.Condition()
         self.stopped = False
+        from fabric_cf.actor.core.container.globals import GlobalsSingleton
+        self.log_config = GlobalsSingleton.get().get_log_config()
 
     def __getstate__(self):
         state = self.__dict__.copy()
@@ -136,7 +138,7 @@ def invoke_handler(self, unit: ConfigToken, operation: str):
 
             handler_class = ReflectionUtils.create_instance_with_params(module_name=handler.get_module_name(),
                                                                         class_name=handler.get_class_name())
-            handler_obj = handler_class(self.logger, handler.get_properties())
+            handler_obj = handler_class(self.log_config, handler.get_properties())
 
             future = None
             if operation == Constants.TARGET_CREATE: