removed genieacs

tools/modules.gitlab.ini

@@ -25,9 +25,6 @@ repo = "https://${GITLAB_USER}:${GITLAB_PASS}@gitlab.com/interlink-sa/flowdat3/m
 [ftth]
 repo = "https://${GITLAB_USER}:${GITLAB_PASS}@gitlab.com/interlink-sa/flowdat3/modules/ftth.git"
 
-[genieacs]
-repo = "https://${GITLAB_USER}:${GITLAB_PASS}@gitlab.com/interlink-sa/flowdat3/modules/genieacs.git"
-
 [geoserver]
 repo = "https://${GITLAB_USER}:${GITLAB_PASS}@gitlab.com/interlink-sa/flowdat3/modules/geoserver.git"
 

tools/modules.ini

@@ -25,9 +25,6 @@ repo = "ssh://git@gitlab.com/interlink-sa/flowdat3/modules/freeradius.git"
 [ftth]
 repo = "ssh://git@gitlab.com/interlink-sa/flowdat3/modules/ftth.git"
 
-[genieacs]
-repo = "ssh://git@gitlab.com/interlink-sa/flowdat3/modules/genieacs.git"
-
 [geoserver]
 repo = "ssh://git@gitlab.com/interlink-sa/flowdat3/modules/geoserver.git"
 

tools/src/ReleaseImages.php

@@ -18,10 +18,6 @@ use FD3\Services\Freeradius;
 use FD3\Services\Ftth;
 use FD3\Services\Ftth_cmd;
 use FD3\Services\Ftth_task;
-use FD3\Services\Genieacs_cwmp;
-use FD3\Services\Genieacs_fs;
-use FD3\Services\Genieacs_gui;
-use FD3\Services\Genieacs_nbi;
 use FD3\Services\Geoserver;
 use FD3\Services\InitialService;
 use FD3\Services\Jsendpoint;
@@ -523,9 +519,6 @@ class ReleaseImages extends Command
         array_pop($ip);
         $ip = implode(".", $ip);
         foreach ($this->_modules_all as $module => $env) {
-            if (strpos($module, "genieacs") !== false) {
-                $module = str_replace("-", "_", $module);
-            }
             $class = "FD3\\Services\\" . ucfirst($module);
             $object = new $class();
             $object
@@ -554,9 +547,6 @@ class ReleaseImages extends Command
         $ip = implode(".", $ip);
         $ips = [];
         foreach ($this->_modules_all as $module => $env) {
-            if (strpos($module, "genieacs") !== false) {
-                $module = str_replace("-", "_", $module);
-            }
             $class = "FD3\\Services\\" . ucfirst($module);
             $object = new $class();
             $object
@@ -619,13 +609,6 @@ class ReleaseImages extends Command
                 // los jsendpoint estan dentro del statsd
                 $new_key = "statsd";
                 $modifyKey = true;
-            } elseif ($new_key == (new Genieacs_cwmp())->getModuleName() ||
-                $new_key == (new Genieacs_fs())->getModuleName() ||
-                $new_key == (new Genieacs_nbi())->getModuleName() ||
-                $new_key == (new Genieacs_gui())->getModuleName()) {
-                // agrego cualquier genieacs
-                $new_key = "genieacs";
-                $modifyKey = true;
             }
             foreach ($repositories as $keyRepo => $valueRepo) {
                 if ($new_key == $keyRepo) {

tools/src/Services/Genieacs_cwmp.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace FD3\Services;
-
-use Docker\Composer\FileFormat;
-use FD3\Release;
-
-class Genieacs_cwmp extends InitialService
-{
-    /**
-     * @var int ip server
-     */
-    protected $ip_server = 28;
-
-    /**
-     * Genieacs_cwmp constructor.
-     */
-    public function __construct()
-    {
-        $this
-            ->setHelp("Modulo de genieacs cwmp")
-            ->setHostEnv(false)
-            ->setVarEnv([])
-            ->setOauth(false)
-            ->setRequired(false)
-            ->setDepends(['ftth']);
-    }
-
-    /**
-     * Add config
-     * @throws \Docker\Composer\ServiceNotFoundException
-     */
-    public function add()
-    {
-        $module = $this->getModuleName();
-        $version = "latest";
-        $registry = "";
-        $host_env_file = "";
-        extract($this->getConfigVar());
-        if ($this->getRelease()->needInstallModule($module)) {
-            $this->getComposer()->addService($module)
-                ->image($registry . "fd3/genieacs-cwmp:" . $version);
-            if ($this->getProduction() === false) {
-                $this->getComposer()->service($module)
-                    ->build("./genieacs/genieacs-cwmp/");
-            }
-            $this->getComposer()->service($module)
-                ->hostname($module)
-                ->addPorts("7547", "7547")
-                ->restart($this->getRelease()->_docker_restart_task)
-                ->addVolumes("/etc/localtime:/etc/localtime:ro")
-                ->addVolumes("./hosts:/etc/hosts")
-                ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());
-            $this->addLink(new Mongodb(), $module)
-                ->addLink(new Redis(), $module);
-        }
-    }
-}

tools/src/Services/Genieacs_fs.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace FD3\Services;
-
-use Docker\Composer\FileFormat;
-use FD3\Release;
-
-class Genieacs_fs extends InitialService
-{
-    /**
-     * @var int ip server
-     */
-    protected $ip_server = 29;
-
-    /**
-     * Genieacs_fs constructor.
-     */
-    public function __construct()
-    {
-        $this
-            ->setHelp("Modulo de genieacs fs")
-            ->setHostEnv(false)
-            ->setVarEnv([])
-            ->setOauth(false)
-            ->setRequired(false)
-            ->setDepends(['ftth']);
-    }
-
-    /**
-     * Add config
-     * @throws \Docker\Composer\ServiceNotFoundException
-     */
-    public function add()
-    {
-        $module = $this->getModuleName();
-        $version = "latest";
-        $registry = "";
-        $host_env_file = "";
-        extract($this->getConfigVar());
-        if ($this->getRelease()->needInstallModule($module)) {
-            $this->getComposer()->addService($module)
-                ->image($registry . "fd3/genieacs-fs:" . $version);
-            if ($this->getProduction() === false) {
-                $this->getComposer()->service($module)
-                    ->build("./genieacs/genieacs-fs/");
-            }
-            $this->getComposer()->service($module)
-                ->hostname($module)
-                ->addPorts("7567", "7567")
-                ->addVolumes("/etc/localtime:/etc/localtime:ro")
-                ->addVolumes("./hosts:/etc/hosts")
-                ->restart($this->getRelease()->_docker_restart_task)
-                ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());
-            $this->addLink(new Mongodb(), $module)
-                ->addLink(new Redis(), $module);
-        }
-    }
-}

tools/src/Services/Genieacs_gui.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace FD3\Services;
-
-use Docker\Composer\FileFormat;
-use FD3\Release;
-
-class Genieacs_gui extends InitialService
-{
-    /**
-     * @var int ip server
-     */
-    protected $ip_server = 30;
-
-    /**
-     * Genieacs_gui constructor.
-     */
-    public function __construct()
-    {
-        $this
-            ->setHelp("Modulo de genieacs gui")
-            ->setHostEnv(false)
-            ->setVarEnv([])
-            ->setOauth(false)
-            ->setRequired(false)
-            ->setDepends(['ftth']);
-    }
-
-    /**
-     * Add config
-     * @throws \Docker\Composer\ServiceNotFoundException
-     */
-    public function add()
-    {
-        $module = $this->getModuleName();
-        $version = "latest";
-        $registry = "";
-        $host_env_file = "";
-        extract($this->getConfigVar());
-        if ($this->getRelease()->needInstallModule($module)) {
-            $this->getComposer()->addService($module)
-                ->image($registry . "fd3/genieacs-gui:" . $version);
-            if ($this->getProduction() === false) {
-                $this->getComposer()->service($module)
-                    ->build("./genieacs/genieacs-gui/");
-            }
-            $this->getComposer()->service($module)
-                ->hostname($module)
-                ->addPorts("3001", "3000")
-                ->restart($this->getRelease()->_docker_restart_task)
-                ->addVolumes("/etc/localtime:/etc/localtime:ro")
-                ->addVolumes("./hosts:/etc/hosts")
-                ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());
-            $this->addLink(new Genieacs_nbi(), $module);
-        }
-    }
-}

tools/src/Services/Genieacs_nbi.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace FD3\Services;
-
-use Docker\Composer\FileFormat;
-use FD3\Release;
-
-class Genieacs_nbi extends InitialService
-{
-    /**
-     * @var int ip server
-     */
-    protected $ip_server = 31;
-
-    /**
-     * Genieacs_nbi constructor.
-     */
-    public function __construct()
-    {
-        $this
-            ->setHelp("Modulo de genieacs nbi")
-            ->setHostEnv(false)
-            ->setVarEnv([])
-            ->setOauth(false)
-            ->setRequired(false)
-            ->setDepends(['ftth']);
-    }
-
-    /**
-     * Add config
-     * @throws \Docker\Composer\ServiceNotFoundException
-     */
-    public function add()
-    {
-        $module = $this->getModuleName();
-        $version = "latest";
-        $registry = "";
-        $host_env_file = "";
-        extract($this->getConfigVar());
-        if ($this->getRelease()->needInstallModule($module)) {
-            $this->getComposer()->addService($module)
-                ->image($registry . "fd3/genieacs-nbi:" . $version);
-            if ($this->getProduction() === false) {
-                $this->getComposer()->service($module)
-                    ->build("./genieacs/genieacs-nbi/");
-            }
-            $this->getComposer()->service($module)
-                ->hostname($module)
-                ->addPorts("7557", "7557")
-                ->restart($this->getRelease()->_docker_restart_task)
-                ->addVolumes("/etc/localtime:/etc/localtime:ro")
-                ->addVolumes("./hosts:/etc/hosts")
-                ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());
-            $this->addLink(new Mongodb(), $module)
-                ->addLink(new Redis(), $module);
-        }
-    }
-}

tools/src/UpdateImages.php

@@ -19,10 +19,6 @@ use FD3\Services\Freeradius;
 use FD3\Services\Ftth;
 use FD3\Services\Ftth_cmd;
 use FD3\Services\Ftth_task;
-use FD3\Services\Genieacs_cwmp;
-use FD3\Services\Genieacs_fs;
-use FD3\Services\Genieacs_gui;
-use FD3\Services\Genieacs_nbi;
 use FD3\Services\Geoserver;
 use FD3\Services\Jsendpoint;
 use FD3\Services\Jsonep_mongo;