Prechádzať zdrojové kódy

Fix DHCPHostCRUDCommand. Fix Parameters.

Daniel Libonati 7 rokov pred
rodič
commit
7bc920a510

+ 9 - 11
app/config/bundles/ik/webservice-bundle/parameters.yml.dist

@@ -1,12 +1,12 @@
 parameters:
-    url_base: 'http://%env(HOST_BASE)%'
-    url_mapas: 'http://%env(HOST_MAPAS)%'
-    url_stats: 'http://%env(HOST_STATS)%'
-    url_ftth: 'http://%env(HOST_FTTH)%'
-    url_radius: 'http://%env(HOST_RADIUS)%'
-    url_cablemodem: 'http://%env(HOST_CABLEMODEM)%'
-    url_dhcp: 'http://%env(HOST_DHCP)%'
-    url_dummy: 'http://%env(HOST_DUMMY)%'
+    url_base: 'https://%env(HOST_BASE)%'
+    url_mapas: 'https://%env(HOST_MAPAS)%'
+    url_stats: 'https://%env(HOST_STATS)%'
+    url_ftth: 'https://%env(HOST_FTTH)%'
+    url_radius: 'https://%env(HOST_RADIUS)%'
+    url_cablemodem: 'https://%env(HOST_CABLEMODEM)%'
+    url_dhcp: 'https://%env(HOST_DHCP)%'
+    url_dummy: 'https://%env(HOST_DUMMY)%'
     client: '%url_base%/api/clients.json'
     sidebar_menu:
         Base: '%url_base%'
@@ -20,9 +20,7 @@ parameters:
     remote_device_log_url: '%url_base%/api/devicelogs.json'
     remote_get_map_url: '%url_mapas%/api/maps.json'
     remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'
-
-    # DHCP APP API URL
-    dhcp_docker: 'http://dhcp:8000'
+    dhcp_docker: 'https://%env(HOST_DHCP)%'
     dhcp_host_post_url: '%dhcp_docker%/api/hosts.json'
     dhcp_host_put_url: '%dhcp_docker%/api/hosts/{id}.json'
     dhcp_host_del_url: '%dhcp_docker%/api/hosts/{id}.json'

+ 8 - 5
src/CablemodemBundle/Command/DHCPHostCRUDCommand.php

@@ -21,17 +21,20 @@ class DHCPHostCRUDCommand extends ContainerAwareCommand
             'CMD_USERNAME' => getenv("CMD_USERNAME") ? getenv("CMD_USERNAME") : 'admin',
             'CMD_PASSWORD' => getenv("CMD_PASSWORD") ? getenv("CMD_PASSWORD") : 'adminpass'
         ];
+
+        $dhcpUrl = getenv("HOST_DHCP");
+
         $this
             ->setName('dhcp:host:crud')
             ->setDescription('DHCP Host CRUD')
             ->setDefinition(array(
                 new InputArgument('mac', InputArgument::REQUIRED, "Cablemodem mac address"),
                 new InputOption('delete', 'd'),
-                new InputOption('url-get', null, InputOption::VALUE_OPTIONAL, 'API URL GET hosts', 'http://dhcp:8000/api/hosts.json'),
-                new InputOption('url-post', null, InputOption::VALUE_OPTIONAL, 'API URL POST hosts', 'http://dhcp:8000/api/hosts.json'),
-                new InputOption('url-put', null, InputOption::VALUE_OPTIONAL, 'API URL PUT hosts', 'http://dhcp:8000/api/hosts/{id}.json'),
-                new InputOption('url-delete', null, InputOption::VALUE_OPTIONAL, 'API URL DELETE hosts', 'http://dhcp:8000/api/hosts/{id}.json'),
-                new InputOption('url-get-hosttype', null, InputOption::VALUE_OPTIONAL, 'API URL GET hosts types', 'http://dhcp:8000/api/hosttypes.json'),
+                new InputOption('url-get', null, InputOption::VALUE_OPTIONAL, 'API URL GET hosts', "https://{$dhcpUrl}/api/hosts.json"),
+                new InputOption('url-post', null, InputOption::VALUE_OPTIONAL, 'API URL POST hosts', "https://{$dhcpUrl}/api/hosts.json"),
+                new InputOption('url-put', null, InputOption::VALUE_OPTIONAL, 'API URL PUT hosts', "https://{$dhcpUrl}/api/hosts/{id}.json"),
+                new InputOption('url-delete', null, InputOption::VALUE_OPTIONAL, 'API URL DELETE hosts', "https://{$dhcpUrl}/api/hosts/{id}.json"),
+                new InputOption('url-get-hosttype', null, InputOption::VALUE_OPTIONAL, 'API URL GET hosts types', "https://{$dhcpUrl}/api/hosttypes.json"),
                 new InputOption('api-username', null, InputOption::VALUE_OPTIONAL, 'API username', $params["CMD_USERNAME"]),
                 new InputOption('api-password', null, InputOption::VALUE_OPTIONAL, 'API password', $params["CMD_PASSWORD"]),
             ))