test: fix smoke test and service layer

Author: weizhouapache

server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java

@@ -599,7 +599,11 @@ public void validateFirewallRule(Account caller, IPAddressVO ipAddress, Integer
             String supportedProtocols;
             String supportedTrafficTypes = null;
             if (purpose == FirewallRule.Purpose.Firewall) {
-                supportedTrafficTypes = caps.get(Capability.SupportedTrafficDirection).toLowerCase();
+                String supportedTrafficTypesStr = caps.get(Capability.SupportedTrafficDirection);
+                if (supportedTrafficTypesStr == null) {
+                    throw new CloudRuntimeException("Supported traffic direction capability is not defined for Firewall service");
+                }
+                supportedTrafficTypes = supportedTrafficTypesStr.toLowerCase();
             }
 
             if (purpose == FirewallRule.Purpose.Firewall && trafficType == FirewallRule.TrafficType.Egress) {

test/integration/smoke/test_network_extension_namespace.py

@@ -30,7 +30,6 @@
 Renamed from ``test_network_extension_provider.py``.  The canonical test file
 is ``test_network_extension_namespace.py``.
 """
-import base64
 import json
 import logging
 import os
@@ -97,15 +96,50 @@
 NETWORK_CAPABILITIES_JSON = json.dumps({
     "services": [
         "Dhcp", "Dns", "UserData",
-        "SourceNat", "StaticNat", "PortForwarding", "Firewall", "Lb"
+        "SourceNat", "StaticNat", "PortForwarding", "Firewall", "Lb", "NetworkACL"
     ],
     "capabilities": {
+        "Lb": {
+            "SupportedLBAlgorithms": "roundrobin,leastconn,source",
+            "SupportedLBIsolation": "dedicated",
+            "SupportedProtocols": "tcp,udp,tcp-proxy",
+            "SupportedStickinessMethods": "lbcookie,appsession",
+            "LbSchemes": "Public",
+            "SslTermination": "false",
+            "VmAutoScaling": "false"
+        },
+        "Firewall": {
+            "TrafficStatistics": "per public ip",
+            "SupportedProtocols": "tcp,udp,icmp",
+            "SupportedEgressProtocols": "tcp,udp,icmp,all",
+            "SupportedTrafficDirection": "ingress,egress",
+            "MultipleIps": "true"
+        },
+        "Dns": {
+            "AllowDnsSuffixModification": "true",
+            "ExternalDns": "true"
+        },
+        "Dhcp": {
+            "DhcpAccrossMultipleSubnets": "true"
+        },
+        "Gateway": {
+            "RedundantRouter": "false"
+        },
         "SourceNat": {
             "SupportedSourceNatTypes": "peraccount",
             "RedundantRouter": "false"
         },
-        "Firewall": {
-            "TrafficStatistics": "per public ip"
+        "StaticNat": {
+            "Supported": "true"
+        },
+        "PortForwarding": {
+            "SupportedProtocols": "tcp,udp"
+        },
+        "UserData": {
+            "Supported": "true"
+        },
+        "NetworkACL": {
+            "SupportedProtocols": "tcp,udp,icmp"
         }
     }
 })
@@ -230,10 +264,9 @@ def _ssh_copy_file(host_ip, host_port, username, password, local_path, remote_pa
     """Transfer *local_path* to *remote_path* on *host_ip* via SshClient."""
     ssh = SshClient(host_ip, int(host_port), username, password)
     ssh.execute("mkdir -p '%s'" % os.path.dirname(remote_path))
-    with open(local_path, 'rb') as fh:
-        b64 = base64.b64encode(fh.read()).decode()
-    ssh.execute("echo '%s' | base64 -d > '%s' && chmod 755 '%s'" %
-                (b64, remote_path, remote_path))
+    # Use SFTP upload to avoid very large shell arguments for script content.
+    ssh.scp(local_path, remote_path)
+    ssh.execute("chmod 755 '%s'" % remote_path)
 
 
 # ---------------------------------------------------------------------------
@@ -484,9 +517,8 @@ def _deploy_scripts(self):
 
         self.mgmt_deployer = MgmtServerDeployer(self.mgtSvrDetails,
                                                 logger=self.logger)
-        # The extension framework executes <extension-name>.sh from extension_path.
-        extension_script = "%s.sh" % os.path.basename(self.extension_path.rstrip('/'))
-        self._mgmt_script_path = os.path.join(self.extension_path, extension_script)
+        # Extension path is the entrypoint file path; append .sh if omitted.
+        self._mgmt_script_path = (self.extension_path or "").strip().rstrip('/')
         self.mgmt_deployer.copy_file(entry_point_src, self._mgmt_script_path)
         self.logger.info("network-namespace.sh deployed to mgmt at %s",
                          self._mgmt_script_path)
@@ -659,9 +691,9 @@ def _setup_extension_nsp_offering(self, ext_name_prefix,
 
         # Register extension to physical network
         register_details = [
-            {"key": "hosts",    "value": kvm_hosts_csv},
-            {"key": "username", "value": self.kvm_host_configs[0].get('username', 'root')},
-            {"key": "password", "value": self.kvm_host_configs[0].get('password', '')},
+            {"hosts": kvm_hosts_csv},
+            {"username": self.kvm_host_configs[0].get('username', 'root')},
+            {"password": self.kvm_host_configs[0].get('password', '')},
         ]
 
         self.extension.register(
@@ -1000,9 +1032,9 @@ def test_05_isolated_network_full_lifecycle(self):
              → assert SSH works (namespace rebuilt, rules reapplied)
         """
         # ---- Setup ----
-        svc = "SourceNat,StaticNat,PortForwarding,Firewall,Lb,UserData"
+        svc = "SourceNat,StaticNat,PortForwarding,Firewall,Lb,UserData,Dhcp,Dns"
         nw_offering, _ext_name = self._setup_extension_nsp_offering(
-            "extnet-iso", supported_services=svc)
+            "extnet-isolated", supported_services=svc)
         account, network, vm = self._create_account_network_vm(
             nw_offering, name_suffix="iso")
 
@@ -1181,12 +1213,12 @@ def test_06_vpc_multi_tier_and_restart(self):
         CloudStack for VPC-associated tier networks.
         """
         # ---- Setup: extension + NSP + isolated offering (for reference) ----
-        svc = "SourceNat,StaticNat,PortForwarding,Lb,UserData"
+        svc = "SourceNat,StaticNat,PortForwarding,Lb,UserData,Dhcp,Dns"
         _nw_offering, ext_name = self._setup_extension_nsp_offering(
             "extnet-vpc", supported_services=svc)
 
         # ---- VPC tier network offering (useVpc=on) ----
-        vpc_tier_svc = "SourceNat,StaticNat,PortForwarding,Lb,UserData"
+        vpc_tier_svc = "SourceNat,StaticNat,PortForwarding,Lb,UserData,Dhcp,Dns"
         _tier_prov   = {s.strip(): ext_name for s in vpc_tier_svc.split(',')}
         vpc_tier_offering = NetworkOffering.create(self.apiclient, {
             "name":              "ExtNet-VPCTier-%s" % random_gen(),