Merge branch 'master' of https://bitbucket.org/ikflowdat/ftth

.drone.yml

@@ -8,8 +8,16 @@ pipeline:
   build:
     image: debian:8.0
     commands:
-      - echo 'Acquire::http { Proxy "http://200.50.168.30:3142"; };' > /etc/apt/apt.conf.d/01proxy
-      - apt-get update && apt-get install -yq build-essential git unzip php5-cli php5-mysql wget mysql-client
+      - echo 'Acquire::http { Proxy "http://200.50.168.30:3142"; };' > /etc/apt/apt.conf.d/01proxy     
+      - apt-get update && apt-get install -yq build-essential git unzip php5-cli php5-mysql wget mysql-client php5-curl
+      
+      # RabbitMQ apt repository
+      - echo 'deb http://www.rabbitmq.com/debian/ testing main' | tee /etc/apt/sources.list.d/rabbitmq.list
+      - wget -O- https://www.rabbitmq.com/rabbitmq-release-signing-key.asc | apt-key add -
+      - apt-get update && apt-get install -yq rabbitmq-server
+      - echo 'export RABBITMQ_NODENAME=rabbit@localhost' | tee /etc/rabbitmq/rabbitmq-env.conf
+      - echo 'export RABBITMQ_NODE_IP_ADDRESS=127.0.0.1' | tee /etc/rabbitmq/rabbitmq-env.conf
+      - service rabbitmq-server restart
 
       - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
       - php composer-setup.php --install-dir=/usr/local/bin/ --filename=composer

.gitignore

@@ -17,3 +17,6 @@
 /vendor/
 /web/bundles/
 app/Resources/workflows/workflow_list.yml
+!/web/workflows_png
+/web/workflows_png/*
+!web/workflows_png/.gitkeep

app/AppKernel.php

@@ -30,7 +30,8 @@ class AppKernel extends Kernel
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new WorkflowBundle\WorkflowBundle(),
             new HWI\Bundle\OAuthBundle\HWIOAuthBundle(),
-            new Base\OAuthClientBundle\BaseOAuthClientBundle()
+            new Base\OAuthClientBundle\BaseOAuthClientBundle(),
+            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/config/parameters.yml.dist

@@ -20,4 +20,11 @@ parameters:
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
     # Url para logout en repositorio base
-    url_logout: 'http://127.0.0.1/base/app_dev.php/logout'
+    url_logout: 'http://127.0.0.1/base/app_dev.php/logout'
+
+    # RabbitMQ parameters
+    rabbit_mq.host:     'localhost'
+    rabbit_mq.port:     5672
+    rabbit_mq.user:     'guest'
+    rabbit_mq.password: 'guest'
+    rabbit_mq.vhost:    '/'

composer.json

@@ -68,10 +68,11 @@
         "stof/doctrine-extensions-bundle": "^1.2",
         "voryx/restgeneratorbundle": "dev-master",
         "base-admin": "dev-master",
-        "base-oauth-client-bundle": "dev-master",
-        "webservice": "dev-master",
+        "ik/oauthclient-bundle": "dev-master",
+        "ik/webservice-bundle": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",
-        "ik/workflow-bundle": "dev-master"
+        "ik/workflow-bundle": "dev-master",
+        "php-amqplib/rabbitmq-bundle": "^1.12"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "8bc30a094142e1d026528643fe53e3b3",
+    "content-hash": "02da0e407d512618f1bb3fca37860c81",
     "packages": [
         {
             "name": "base-admin",
@@ -29,32 +29,6 @@
             ],
             "time": "2017-04-04 15:01:23"
         },
-        {
-            "name": "base-oauth-client-bundle",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "42c8e682837d565cab5f98765f630a58d202f96a"
-            },
-            "require": {
-                "hwi/oauth-bundle": "^0.5.3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Base\\OAuthClientBundle\\": ""
-                }
-            },
-            "description": "Flowdat 3 Base OAuth Client Bundle",
-            "keywords": [
-                "Admin Generator",
-                "admin",
-                "bundle",
-                "oauth"
-            ],
-            "time": "2017-04-04 18:30:30"
-        },
         {
             "name": "behat/transliterator",
             "version": "v1.1.0",
@@ -1301,13 +1275,64 @@
             ],
             "time": "2017-01-08T14:13:58+00:00"
         },
+        {
+            "name": "ik/oauthclient-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+                "reference": "0118134e5c0a4731b2f54328a960756bb83ac32e"
+            },
+            "require": {
+                "ext-curl": "*",
+                "hwi/oauth-bundle": "^0.5.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Base\\OAuthClientBundle\\": ""
+                }
+            },
+            "description": "Flowdat 3 Base OAuth Client Bundle",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "bundle",
+                "oauth"
+            ],
+            "time": "2017-04-06 15:40:13"
+        },
+        {
+            "name": "ik/webservice-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
+                "reference": "1c88fb658dfe9d8c9b5b15300d9754aaf2ecceaa"
+            },
+            "require": {
+                "ext-curl": "*",
+                "kriswallsmith/buzz": "~0.13"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "WebserviceBundle\\": ""
+                }
+            },
+            "description": "The Flowdat3 Webservice Rest",
+            "time": "2017-04-06 15:41:02"
+        },
         {
             "name": "ik/workflow-bundle",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "3a0f4212ccca5907cb7f8d30812eba27180c8150"
+                "reference": "79de983588842b6f16e2436af260eacbf203d4be"
+            },
+            "require": {
+                "php-amqplib/rabbitmq-bundle": "^1.12"
             },
             "type": "library",
             "autoload": {
@@ -1334,7 +1359,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-04-05 14:30:12"
+            "time": "2017-04-07 13:32:10"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -2070,6 +2095,141 @@
             ],
             "time": "2017-03-13T16:27:32+00:00"
         },
+        {
+            "name": "php-amqplib/php-amqplib",
+            "version": "v2.6.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-amqplib/php-amqplib.git",
+                "reference": "fa2f0d4410a11008cb36b379177291be7ee9e4f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/fa2f0d4410a11008cb36b379177291be7ee9e4f6",
+                "reference": "fa2f0d4410a11008cb36b379177291be7ee9e4f6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-bcmath": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.3.0"
+            },
+            "replace": {
+                "videlalvaro/php-amqplib": "self.version"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8",
+                "scrutinizer/ocular": "^1.1",
+                "squizlabs/php_codesniffer": "^2.5"
+            },
+            "suggest": {
+                "ext-sockets": "Use AMQPSocketConnection"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpAmqpLib\\": "PhpAmqpLib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Alvaro Videla",
+                    "role": "Original Maintainer"
+                },
+                {
+                    "name": "John Kelly",
+                    "email": "johnmkelly86@gmail.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Raúl Araya",
+                    "email": "nubeiro@gmail.com",
+                    "role": "Maintainer"
+                }
+            ],
+            "description": "Formerly videlalvaro/php-amqplib.  This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
+            "homepage": "https://github.com/php-amqplib/php-amqplib/",
+            "keywords": [
+                "message",
+                "queue",
+                "rabbitmq"
+            ],
+            "time": "2016-04-11T14:30:01+00:00"
+        },
+        {
+            "name": "php-amqplib/rabbitmq-bundle",
+            "version": "v1.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-amqplib/RabbitMqBundle.git",
+                "reference": "0bb11edec0abdf6dc28eac0144c0a673dddba28f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-amqplib/RabbitMqBundle/zipball/0bb11edec0abdf6dc28eac0144c0a673dddba28f",
+                "reference": "0bb11edec0abdf6dc28eac0144c0a673dddba28f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "php-amqplib/php-amqplib": "~2.6",
+                "psr/log": "~1.0",
+                "symfony/config": "~2.3 || ~3.0",
+                "symfony/console": "~2.3 || ~3.0",
+                "symfony/dependency-injection": "~2.3 || ~3.0",
+                "symfony/event-dispatcher": "~2.3 || ~3.0",
+                "symfony/yaml": "~2.3 || ~3.0"
+            },
+            "replace": {
+                "oldsound/rabbitmq-bundle": "self.version"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8 || ~5.0",
+                "symfony/debug": "~2.3 || ~3.0",
+                "symfony/serializer": "~2.3 || ~3.0"
+            },
+            "suggest": {
+                "symfony/framework-bundle": "To use this lib as a full Symfony Bundle and to use the profiler data collector"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "OldSound\\RabbitMqBundle\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alvaro Videla"
+                }
+            ],
+            "description": "Integrates php-amqplib with Symfony2|3 and RabbitMq. Formerly oldsound/rabbitmq-bundle.",
+            "keywords": [
+                "AMQP",
+                "Symfony2",
+                "message",
+                "queue",
+                "rabbitmq"
+            ],
+            "time": "2016-12-09T12:58:28+00:00"
+        },
         {
             "name": "phpcollection/phpcollection",
             "version": "0.5.0",
@@ -5103,26 +5263,6 @@
             ],
             "time": "2016-11-23T20:04:58+00:00"
         },
-        {
-            "name": "webservice",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "c77a01f0abba0272d6c3c00bf4da40d49ede1261"
-            },
-            "require": {
-                "kriswallsmith/buzz": "~0.13"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "WebserviceBundle\\": ""
-                }
-            },
-            "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-03-28 17:33:13"
-        },
         {
             "name": "willdurand/jsonp-callback-validator",
             "version": "v1.1.0",
@@ -5282,8 +5422,8 @@
     "stability-flags": {
         "voryx/restgeneratorbundle": 20,
         "base-admin": 20,
-        "base-oauth-client-bundle": 20,
-        "webservice": 20,
+        "ik/oauthclient-bundle": 20,
+        "ik/webservice-bundle": 20,
         "ik/workflow-bundle": 20
     },
     "prefer-stable": false,

web/workflows_png/onu_state_v2.dot

@@ -1,10 +0,0 @@
-digraph workflow {
-  ratio="compress" rankdir="LR"
-  node [fontsize="9" fontname="Arial" color="#333333" fillcolor="lightblue" fixedsize="1" width="1"];
-  edge [fontsize="9" fontname="Arial" color="#333333" arrowhead="normal" arrowsize="0.5"];
-
-  place_active [label="active", shape=circle, style="filled"];
-  place_suspend [label="suspend", shape=circle];
-  place_active -> place_suspend [label="active_to_suspends" style="solid"];
-}
-