Merge branch demo

.drone.yml

@@ -26,6 +26,9 @@ pipeline:
       - rm dotdeb.gpg
       - apt-get update 
       - apt-get install -yq php7.0-cli php7.0-mysql mysql-client php7.0-curl php7.0-xml php7.0-bcmath php7.0-mbstring
+
+      - yes | mysqladmin -h 127.0.0.1 create fd3_ftth
+      - yes | mysqladmin -h 127.0.0.1 create fd_session
       
       - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
       - php composer-setup.php --install-dir=/usr/local/bin/ --filename=composer
@@ -36,6 +39,7 @@ pipeline:
       - mkdir -p /root/.ssh/
       - ssh-keyscan -p222 200.50.168.30 >> ~/.ssh/known_hosts
       - ssh-keyscan -p222 infra.flowdat.com >> ~/.ssh/known_hosts
+      - ssh-keyscan -p222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts
       - ssh-keyscan -p22 bitbucket.org >> ~/.ssh/known_hosts
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa

app/Resources/workflows/workflow_list.yml

@@ -0,0 +1 @@
+

app/Resources/workflows/workflow_list.yml.dist

@@ -1 +1,69 @@
-
+framework:
+  workflows:
+    olt_workflow:
+      type: state_machine
+      marking_store:
+        type: single_state
+        arguments:
+          - currentState
+      supports:
+        - FTTHBundle\Entity\OLT
+      initial_place: disabled
+      places:
+        - enabled
+        - disabled
+      transitions:
+        disable:
+          from: enabled
+          to: disabled
+        enable:
+          from: disabled
+          to: enabled
+    onu_workflow:
+      type: state_machine
+      marking_store:
+        type: single_state
+        arguments:
+          - currentState
+      supports:
+        - FTTHBundle\Entity\ONU
+      initial_place: active
+      places:
+        - active
+        - disable
+      transitions:
+        add_config:
+          from: active
+          to: active
+        disable:
+          from: active
+          to: disable
+        active:
+          from: disable
+          to: active
+    nose:
+      type: state_machine
+      marking_store:
+        type: single_state
+        arguments:
+          - currentState
+      supports:
+        - FTTHBundle\Entity\ONU
+      initial_place: state_two
+      places:
+        - state_one
+        - state_two
+        - state_three
+      transitions:
+        one_to_two:
+          from: state_one
+          to: state_two
+        two_to_three:
+          from: state_two
+          to: state_three
+        two_to_one:
+          from: state_two
+          to: state_one
+        three_to_one:
+          from: state_three
+          to: state_one

app/config/bundles/ik/device-bundle/parameters.yml

@@ -1,6 +1,6 @@
 # This file is auto-generated during the composer install
 parameters:
-    device_check_url: 'http://127.0.0.1/base/app_dev.php/api/devices/check.json'
-    device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
-    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/device.json'
-    device_put_url: 'http://127.0.0.1/base/app_dev.php/api/device.json'
+    device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
+    device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
+    device_delete_post_url: 'http://%env(HOST_BASE)%/api/device.json'
+    device_put_url: 'http://%env(HOST_BASE)%/api/devices/'

app/config/config.yml

@@ -43,8 +43,8 @@ framework:
     session:
         name: ftth_session
         # http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
-#        handler_id: session.handler.pdo
-        handler_id: session.handler.native_file
+        handler_id: session.handler.pdo
+#        handler_id: session.handler.native_file
         save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
     fragments:       ~
     http_method_override: true

app/config/parameters.yml.docker

@@ -30,8 +30,8 @@ parameters:
     rabbit_mq.password: 'guest'
     rabbit_mq.vhost:    '/'
 
-    db_session_host: 127.0.0.1
-    db_session_port: null
+    db_session_host: mysql
+    db_session_port: ~
     db_session_name: fd_session
     db_session_user: root
-    db_session_password: null
+    db_session_password: 235r2342gtfsw

composer.json

@@ -148,8 +148,8 @@
         ],
         "mkdir-dir-cache-sessions-logs": "mkdir -p var/cache var/logs var/sessions",
         "chmod-dir-cache-sessions-logs": "chmod 777 -R var/cache var/logs var/sessions",
-        "doctrine-update": "php bin/console doctrine:schema:update --force && echo y",
-        "doctrine-migrations": "php bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration",
+        "doctrine-update": "php bin/console doctrine:schema:update --force",
+        "doctrine-migrations": "php bin/console doctrine:migrations:migrate --no-interaction",
         "auto-increment": "php bin/console baseadmin:autoincrement",
         "post-install-cmd": [
             "@workflows-commands",

composer.lock

@@ -1397,7 +1397,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "e69fc831922ed1aba7a251ceb07d1319baaeb897"
+                "reference": "34a97b23026ed6f9d39dffd1c9b2fdcdac71d1a9"
             },
             "type": "library",
             "autoload": {
@@ -1412,7 +1412,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-09 12:46:49"
+            "time": "2017-08-10 13:59:53"
         },
         {
             "name": "ik/device-bundle",