NS: minor changes in scripts and test

Author: weizhouapache

extensions/network-namespace/network-namespace-wrapper.sh

@@ -1397,7 +1397,7 @@ dhcp-option=3,${GATEWAY}
 dhcp-hostsfile=${dhcp_hosts}
 addn-hosts=${hosts}
 dhcp-optsfile=${dhcp_opts}
-log-facility=/var/log/cloudstack/network-namespace-dnsmasq-${NETWORK_ID}.log
+log-facility=/var/log/cloudstack/extensions/${_WRAPPER_EXT_DIR}/dnsmasq-${NETWORK_ID}.log
 EOF
     # Add DHCP option 15 (domain-search) when provided by the caller
     if [ -n "${DOMAIN}" ]; then
@@ -1649,7 +1649,7 @@ ${unixd_line}
 ${authz_line}
 
 DocumentRoot ${www}
-ErrorLog /var/log/cloudstack/network-namespace-apache2-${NETWORK_ID}.log
+ErrorLog /var/log/cloudstack/extensions/${_WRAPPER_EXT_DIR}/apache2-${NETWORK_ID}.log
 
 <VirtualHost ${listen_ip}:80>
     ServerName metadata
@@ -1718,7 +1718,7 @@ _svc_start_or_reload_passwd_server() {
     local script_f; script_f=$(_passwd_server_script)
     local pid_f;    pid_f=$(_passwd_server_pid)
     local passwd_f; passwd_f=$(_passwd_file)
-    local log_f;    log_f="/var/log/cloudstack/network-namespace-passwd-${NETWORK_ID}.log"
+    local log_f;    log_f="/var/log/cloudstack/extensions/${_WRAPPER_EXT_DIR}/passwd-${NETWORK_ID}.log"
 
     mkdir -p "$(dirname "${script_f}")"
     touch "${passwd_f}"

test/integration/smoke/test_network_extension_namespace.py

@@ -71,23 +71,17 @@
 
 _multiprocess_shared_ = True
 
-# Base directory on KVM agents where wrapper scripts are installed.
-# The actual per-extension subdirectory is derived at runtime from the
-# extension name: /etc/cloudstack/extensions/<ext-name>/
-EXTENSIONS_BASE_DIR   = '/etc/cloudstack/extensions'
+# The file names of the scripts to deploy on the management server and KVM hosts.
 SCRIPT_FILENAME       = 'network-namespace-wrapper.sh'
 ENTRY_POINT_FILENAME  = 'network-namespace.sh'
 
-# State directory used by network-namespace-wrapper.sh on KVM hosts
-KVM_STATE_DIR = '/var/lib/cloudstack/network-namespace'
-
 # Remote URLs to download the scripts from
 _GITHUB_BASE = (
     'https://raw.githubusercontent.com/apache/cloudstack-extensions'
-    '/refs/heads/network-namespace/Network-Namespace'
+    '/refs/heads/network-namespace/Network-Namespace/'
 )
-WRAPPER_SCRIPT_URL     = _GITHUB_BASE + '/network-namespace-wrapper.sh'
-ENTRY_POINT_SCRIPT_URL = _GITHUB_BASE + '/network-namespace.sh'
+WRAPPER_SCRIPT_URL     = _GITHUB_BASE + SCRIPT_FILENAME
+ENTRY_POINT_SCRIPT_URL = _GITHUB_BASE + ENTRY_POINT_FILENAME
 
 # Local cache paths (downloaded once, reused across test methods)
 _THIS_DIR = os.path.dirname(os.path.abspath(__file__))