Archivo de parameters no versionado

.drone.yml

@@ -7,6 +7,11 @@ services:
 pipeline:
   build:
     image: debian:8.0
+    environment:
+      HOST_FTTH: ftth.fd3.flowdat.com
+      HOST_STATS: stats.fd3.flowdat.com
+      HOST_MAPAS: mapas.fd3.flowdat.com
+      HOST_BASE: base.fd3.flowdat.com
     commands:
       - echo 'Acquire::http { Proxy "http://200.50.168.30:3142"; };' > /etc/apt/apt.conf.d/01proxy  
       
@@ -39,7 +44,7 @@ pipeline:
       - ssh-keyscan -p222 infra.flowdat.com >> ~/.ssh/known_hosts
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
-      - composer install
+      - composer install -n
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
-      - vendor/phpunit/phpunit/phpunit --tap
+      - vendor/phpunit/phpunit/phpunit --tap

Dockerfile

@@ -17,6 +17,7 @@ RUN mkdir ~/.ssh
 RUN ssh-keyscan -H bitbucket.org >> ~/.ssh/known_hosts
 RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
 RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
+RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
 
 WORKDIR /opt/ftth
 
@@ -31,6 +32,9 @@ RUN cp app/config/parameters.yml.docker app/config/parameters.yml
 RUN cp app/config/url_webservice.yml.docker app/config/url_webservice.yml
 RUN cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml
 
+RUN cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml
+
+
 RUN rm -rf /opt/ftth/app/config/parameters.yml /opt/ftth/app/config/url_webservice.yml
 
 RUN cp -r keys /opt/keys/
@@ -43,6 +47,7 @@ CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --
  	cp app/config/parameters.yml.docker app/config/parameters.yml ;\
  	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
  	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
+	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
         composer dump-autoload ;\
         composer run-script symfony-scripts --no-interaction ;\
- 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0
+ 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0 --env=dev

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

@@ -1,6 +0,0 @@
-# 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/devices/'

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

@@ -0,0 +1,5 @@
+# This file is auto-generated during the composer install
+parameters:
+    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'

app/config/url_webservice.yml.docker

@@ -1,7 +1,7 @@
 parameters:
     url_base: 'http://%env(HOST_BASE)%'
-    url_mapas: 'http://%env(HOST_MAPAS)%' # url app Mapas
-    url_stats: 'http://%env(HOST_STATS)%' # url app Stats
+    url_mapas: 'http://%env(HOST_MAPAS)%'
+    url_stats: 'http://%env(HOST_STATS)%'
 
     client: '%url_base%/api/clients.json'
 
@@ -9,5 +9,5 @@ parameters:
 
     sidebar_menu:
         Base: '%url_base%/'
-        Mapas: '%url_mapas%'
-        Stats: '%url_stats%'
+        Mapas: '%url_mapas%/'
+        Stats: '%url_stats%/'

composer.lock

@@ -8,25 +8,29 @@
     "packages": [
         {
             "name": "behat/transliterator",
-            "version": "v1.1.0",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Transliterator.git",
-                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003"
+                "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/868e05be3a9f25ba6424c2dd4849567f50715003",
-                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003",
+                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c",
+                "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "chuyskywalker/rolling-curl": "^3.1",
+                "php-yaoi/php-yaoi": "^1.0"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -44,7 +48,7 @@
                 "slug",
                 "transliterator"
             ],
-            "time": "2015-09-28T16:26:35+00:00"
+            "time": "2017-04-04T11:38:05+00:00"
         },
         {
             "name": "cocur/slugify",
@@ -1026,20 +1030,20 @@
         },
         {
             "name": "gedmo/doctrine-extensions",
-            "version": "v2.4.28",
+            "version": "v2.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Atlantic18/DoctrineExtensions.git",
-                "reference": "58038d5d217b6ba2c75de90cb2f6d424d86fab56"
+                "reference": "f65c02eae3bff1aa57709ea4c8ca26947df95b9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/58038d5d217b6ba2c75de90cb2f6d424d86fab56",
-                "reference": "58038d5d217b6ba2c75de90cb2f6d424d86fab56",
+                "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/f65c02eae3bff1aa57709ea4c8ca26947df95b9c",
+                "reference": "f65c02eae3bff1aa57709ea4c8ca26947df95b9c",
                 "shasum": ""
             },
             "require": {
-                "behat/transliterator": "1.1",
+                "behat/transliterator": "~1.2",
                 "doctrine/common": "~2.4",
                 "php": ">=5.3.2"
             },
@@ -1100,7 +1104,7 @@
                 "tree",
                 "uploadable"
             ],
-            "time": "2017-04-23T08:59:41+00:00"
+            "time": "2017-05-29T17:33:48+00:00"
         },
         {
             "name": "hwi/oauth-bundle",
@@ -5006,16 +5010,16 @@
         },
         {
             "name": "symfony/symfony",
-            "version": "v3.2.8",
+            "version": "v3.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "85959c2abbe4d2f050f950f39c9c3cf83819f3df"
+                "reference": "78c08f2faa42210db4fe6f4ece73891ca546a9a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/85959c2abbe4d2f050f950f39c9c3cf83819f3df",
-                "reference": "85959c2abbe4d2f050f950f39c9c3cf83819f3df",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/78c08f2faa42210db4fe6f4ece73891ca546a9a0",
+                "reference": "78c08f2faa42210db4fe6f4ece73891ca546a9a0",
                 "shasum": ""
             },
             "require": {
@@ -5146,7 +5150,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2017-05-01T17:47:03+00:00"
+            "time": "2017-05-29T19:32:17+00:00"
         },
         {
             "name": "twig/extensions",
@@ -5206,21 +5210,20 @@
         },
         {
             "name": "twig/twig",
-            "version": "v2.3.2",
+            "version": "v1.33.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "85e8372c451510165c04bf781295f9d922fa524b"
+                "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/85e8372c451510165c04bf781295f9d922fa524b",
-                "reference": "85e8372c451510165c04bf781295f9d922fa524b",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/dd6ca96227917e1e85b41c7c3cc6507b411e0927",
+                "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "symfony/polyfill-mbstring": "~1.0"
+                "php": ">=5.2.7"
             },
             "require-dev": {
                 "psr/container": "^1.0",
@@ -5230,7 +5233,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "1.33-dev"
                 }
             },
             "autoload": {
@@ -5265,7 +5268,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2017-04-21T00:13:02+00:00"
+            "time": "2017-04-20T17:39:48+00:00"
         },
         {
             "name": "voryx/restgeneratorbundle",
@@ -5457,23 +5460,23 @@
     "packages-dev": [
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v3.2.8",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "00916603c524b8048906de460b7ea0dfa1651281"
+                "reference": "1a09124ea479cca85fc66a6f21e59aa952ebed1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/00916603c524b8048906de460b7ea0dfa1651281",
-                "reference": "00916603c524b8048906de460b7ea0dfa1651281",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1a09124ea479cca85fc66a6f21e59aa952ebed1f",
+                "reference": "1a09124ea479cca85fc66a6f21e59aa952ebed1f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "conflict": {
-                "phpunit/phpunit": ">=6.0"
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
             },
             "suggest": {
                 "ext-zip": "Zip support is required when using bin/simple-phpunit",
@@ -5485,7 +5488,7 @@
             "type": "symfony-bridge",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"
                 }
             },
             "autoload": {
@@ -5515,7 +5518,7 @@
             ],
             "description": "Symfony PHPUnit Bridge",
             "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:13:17+00:00"
+            "time": "2017-05-28T11:10:04+00:00"
         }
     ],
     "aliases": [],

src/FTTHBundle/Entity/NAP.php

@@ -17,7 +17,7 @@ class NAP
     use ONUTrait;
 
     // Cantidad máxima de ONU por NAP
-    const MAX_NUMBER_ONU = 2;
+    const MAX_NUMBER_ONU = 64;
     
     /**
      * @var int
@@ -38,12 +38,12 @@ class NAP
     private $name;
 
     /**
-     * @ORM\ManyToOne(targetEntity="NAP")
+     * @ORM\ManyToOne(targetEntity="NAP", fetch="EXTRA_LAZY")
      */
     protected $parent;
         
     /**
-     * @ORM\OneToMany(targetEntity="ONU", mappedBy="nap")
+     * @ORM\OneToMany(targetEntity="ONU", mappedBy="nap", fetch="EXTRA_LAZY")
      */
     protected $onus;
 

src/FTTHBundle/Entity/OLT.php

@@ -87,7 +87,7 @@ class OLT implements DeviceInterface
     protected $tenancyId = 1;
 
     /**
-     * @ORM\OneToMany(targetEntity="ONU", mappedBy="olt")
+     * @ORM\OneToMany(targetEntity="ONU", mappedBy="olt", fetch="EXTRA_LAZY")
      */
     protected $onus;
 

src/FTTHBundle/Entity/OLTModel.php

@@ -33,7 +33,7 @@ class OLTModel
     private $name;
     
     /**
-     * @ORM\OneToMany(targetEntity="OLT", mappedBy="model")
+     * @ORM\OneToMany(targetEntity="OLT", mappedBy="model", fetch="EXTRA_LAZY")
      */
     protected $olts;
 

src/FTTHBundle/Entity/Profile.php

@@ -48,7 +48,7 @@ class Profile
     private $download;   
 
     /**
-     * @ORM\OneToMany(targetEntity="ONU", mappedBy="profile")
+     * @ORM\OneToMany(targetEntity="ONU", mappedBy="profile", fetch="EXTRA_LAZY")
      */
     protected $onus;