Merge branch '11' into 'master'

11

See merge request interlink-sa/flowdat3/modules/ftth!131

Dockerfile

@@ -1,41 +1,33 @@
 FROM docker.infra.flowdat.com/fd3/sf-php:latest
-EXPOSE 8000
 
 ADD . /opt/ftth
 
 WORKDIR /opt/ftth
 
-RUN rm -rf /opt/ftth/vendor/*
-RUN rm -f app/config/parameters.yml
-RUN rm -f app/config/url_webservice.yml
-RUN rm -f app/config/hwioauthbundle/parameters.yml
-
-# estos archivos deben ser generados con su correspondiente .dist desde el composer.
-#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 apt-get update && apt-get install -yq php-soap python-pip
-
-RUN chmod 0600 /opt/keys/*
-RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress
-
-RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; git clone git@bitbucket.org:ikflowdat/extra.git /opt/extra ; cp -r /opt/extra/netmiko /opt/netmiko ; rm -rf /opt/extra
-RUN pip install -e /opt/netmiko
-RUN pip install paramiko argparse
-
-RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; git clone git@bitbucket.org:ikflowdat/json-wsdl.git /opt/json-wsdl ;  cd /opt/json-wsdl ; composer install --no-scripts --no-interaction --no-progress
-
-#RUN cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/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 ;\
-#    cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
-
-RUN apt-get update && apt-get install -yq php-fpm; \
+RUN chmod 0600 /opt/keys/*; \
+    eval $(ssh-agent); \
+    ssh-add /opt/keys/bitbucket.id_rsa; \
+    rm -f app/config/parameters.yml \
+          app/config/url_webservice.yml \
+          app/config/hwioauthbundle/parameters.yml \
+          app/config/parameters.yml \
+          app/config/url_webservice.yml; \
+    cp app/Resources/workflows/workflow_list.yml.dist app/Resources/workflows/workflow_list.yml; \
+    cp app/config/bundles/ik/audit-bundle/parameters.yml.dist app/config/bundles/ik/audit-bundle/parameters.yml; \
+    cp app/config/bundles/ik/device-bundle/parameters.yml.dist app/config/bundles/ik/device-bundle/parameters.yml; \
+    cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml; \
+    cp app/config/url_webservice.yml.dist app/config/url_webservice.yml; \
+    cp app/config/parameters.yml.dist app/config/parameters.yml; \
+    cp app/config/hwioauthbundle/parameters.yml.dist app/config/hwioauthbundle/parameters.yml; \
+    composer install --no-scripts --no-interaction --no-progress; \
+    git clone git@gitlab.com:interlink-sa/flowdat3/modules/netmiko.git /opt/netmiko; \
+    pip install -e /opt/netmiko; \
+    pip install paramiko argparse; \
+    git clone git@gitlab.com:interlink-sa/flowdat3/vendors/json-wsdl.git /opt/json-wsdl; \
+    cd /opt/json-wsdl; \
+    composer install --no-scripts --no-interaction --no-progress; \
+    git clone git@gitlab.com:interlink-sa/flowdat3/modules/connect.git /usr/bin/connect; \
+    cd /opt/ftth; \
     mkdir -p /run/php; \
     sed -i 's#listen = /run/php/php7.0-fpm.sock#listen = /run/php/ftth.sock#g' /etc/php/7.0/fpm/pool.d/www.conf; \
     sed -i 's#listen = 0.0.0.0:9000#listen = /run/php/ftth.sock#g' /etc/php/7.0/fpm/pool.d/www.conf; \
@@ -46,15 +38,14 @@ RUN apt-get update && apt-get install -yq php-fpm; \
     sed -i 's#listen.group = www-data#listen.group = root#g' /etc/php/7.0/fpm/pool.d/www.conf; \
     sed -i 's#;listen.mode = 0660#listen.mode = 0777#g' /etc/php/7.0/fpm/pool.d/www.conf; \
     sed -i 's#pm.max_children = 5#pm.max_children = 10#g' /etc/php/7.0/fpm/pool.d/www.conf; \
-    sed -i 's#;pm.max_requests = 500#pm.max_requests = 500#g' /etc/php/7.0/fpm/pool.d/www.conf
-
-CMD env ; cp /opt/ftth/keys/fullchain.pem /usr/share/ca-certificates/$HOST_BASE ;\
-    cat /usr/local/share/ca-certificates/$HOST_BASE ;\ 
-    echo $HOST_BASE >> /etc/ca-certificates.conf ;\
-    update-ca-certificates ;\
-    eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress;\
-    rm var/cache/* -rf ;\
-    composer run-script post-install-cmd --no-interaction ;\
-    cat app/config/hwioauthbundle/parameters.yml ;\
-    chmod 777 -R var/cache/ var/logs/ var/sessions/ ;\
+    sed -i 's#;pm.max_requests = 500#pm.max_requests = 500#g' /etc/php/7.0/fpm/pool.d/www.conf; \
+    chmod 777 -R var/cache/ var/logs/ var/sessions/; \
+    rm -rf /var/lib/apt/lists/*
+
+CMD env; \
+    cp /opt/ftth/keys/fullchain.pem /usr/share/ca-certificates/$HOST_BASE; \
+    echo $HOST_BASE >> /etc/ca-certificates.conf; \
+    update-ca-certificates; \
+    rm -rf var/cache/*; \
+    composer run-script post-install-cmd --no-interaction; \
     php-fpm7.0 -F -R -O

app/config/url_webservice.yml.dist

@@ -13,7 +13,7 @@ parameters:
     active_menu: FTTH
     navbar_menu:
         Base: '%url_base%'
-        Cablemodems: '%url_cablemodem%'
+        Cablemodem: '%url_cablemodem%'
         FTTH: '%url_ftth%'
         Stats: '%url_stats%'
         DHCP: '%url_dhcp%'

app/config/url_webservice.yml.docker

@@ -12,7 +12,7 @@ parameters:
     active_menu: FTTH
     navbar_menu:
         Base: '%url_base%'
-        Cablemodems: '%url_cablemodem%'
+        Cablemodem: '%url_cablemodem%'
         FTTH: '%url_ftth%'
         Stats: '%url_stats%'
         DHCP: '%url_dhcp%'

composer.json

@@ -208,6 +208,7 @@
         "auto-increment": "php bin/console baseadmin:autoincrement --tables='action,oltmodel,onumodel,profile,template,vlan_id,workflow'",
         "workflow-default": "php bin/console workflow:default --class=FTTHBundle\\\\Entity\\\\ONU --all",
 	    "update-data": "php bin/console ik:update:data 'app/DoctrineMigrations/src/'",
+        "assets-static": " bin/console assets:install web",
         "post-install-cmd": [
             "@workflows-commands",
             "@symfony-scripts",
@@ -218,7 +219,8 @@
             "@doctrine-migrations-down",
             "@doctrine-migrations",
             "@workflow-default",
-	        "@auto-increment"
+	        "@auto-increment",
+            "@assets-static"
         ],
         "post-update-cmd": [
             "@workflows-commands",
@@ -226,7 +228,8 @@
             "@mkdir-dir-cache-sessions-logs",
             "@chmod-dir-cache-sessions-logs",
             "@auto-increment",
-            "@workflow-default"
+            "@workflow-default",
+            "@assets-static"
         ]
     },
     "extra": {

composer.lock

@@ -1947,7 +1947,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "0e77ef117751fc9360086347cb8554a507d84ce6"
+                "reference": "65b2f7d20973ab2108bd5a2a03acd5c6364e2ff2"
             },
             "type": "library",
             "autoload": {
@@ -1962,7 +1962,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2019-03-28T11:53:21+00:00"
+            "time": "2019-04-05T14:00:21+00:00"
         },
         {
             "name": "ik/check-sintax-bundle",
@@ -2106,7 +2106,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "fe4d1edd01493e18cd15c5108200c85853b9947e"
+                "reference": "ddcdd35701577440b564b42a65ea55e0f675cd96"
             },
             "require": {
                 "ext-curl": "*",
@@ -2125,7 +2125,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2019-03-01T17:46:20+00:00"
+            "time": "2019-04-05T15:00:43+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -2202,7 +2202,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "7b977e8167e932b826c6ed470b1abb4bb7f999d5"
+                "reference": "8767981f13e591b805cde0ee8319fb8f15a4b364"
             },
             "require": {
                 "ext-curl": "*",
@@ -2215,7 +2215,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2019-03-14T18:25:25+00:00"
+            "time": "2019-04-05T14:57:21+00:00"
         },
         {
             "name": "ik/workflow-bundle",

src/FTTHBundle/tests/ONURESTControllerTest.php

@@ -296,18 +296,16 @@ class ONURESTControllerTest extends WebTestCaseBase
         $fakeWebService = $this->getClient()->getContainer()->get('webservice');
         $original->setWebservice($fakeWebService);
 
-        $url = $this->getUriPutDelete() . $json["id"] . "/apply/administrative_state/active_to_suspend.json";
-        $headers = array('PHP_AUTH_USER' => 'interno', 'PHP_AUTH_PW' => 'gran5pe1nterno');
-        $this->getClient()->request('GET', $url, [], [], $headers);
+        $this->getClient()->request('GET',
+            $this->getUriPutDelete() . $json["id"] . "/apply/administrative_state/active_to_suspend.json", array());
         $response = $this->getClient()->getResponse();
 
         $json = json_decode($response->getContent(), true);
-        
-        var_dump($response->getContent(),$json);
-        // $this->assertEquals(201, $response->getStatusCode(), "Error en la respuesta http.");
-        // $this->assertEquals("suspend", $json["administrativeState"]);
 
-        // $response = $this->getClient()->getResponse();
+       // $this->assertEquals(201, $response->getStatusCode(), "Error en la respuesta http.");
+        //$this->assertEquals("suspend", $json["administrativeState"]);
+
+        $response = $this->getClient()->getResponse();
     }
 
     /**