continue tweaks. test works

openziti · Oct 1, 2023 · f41e9a5 · f41e9a5
1 parent c51e98a
commit f41e9a5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/OpenZiti.NET/src/OpenZiti/Native/nAPI.cs b/OpenZiti.NET/src/OpenZiti/Native/nAPI.cs
@@ -16,14 +16,20 @@ limitations under the License.
 
 using System;
 using System.Net.Sockets;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+[assembly: InternalsVisibleTo("UnitTests")]
 namespace OpenZiti.Native {
     public class API {
         public const CallingConvention CALL_CONVENTION = CallingConvention.Cdecl;
 
         public const string Z4D_DLL_PATH = @"ziti4dotnet";
 
+        public static string GetZitiPath() {
+            return Z4D_DLL_PATH;
+        }
+
         #region //ziti.h - functions exported from the ziti-sdk-c project from ziti.h
 
         //these functions should be declared in the same order as they appear in ziti.h to make diffing easier!

diff --git a/TestProject/Program.cs b/TestProject/Program.cs
@@ -93,10 +93,8 @@ public static async Task Main(string[] args) {
 
                 //create the service policies
                 var serviceRoles = new Roles() { $"#{testServices}" };
-                var dialRoles = new Roles() { $"#{svcName}.binders" };
-                var bindRoles = new Roles() { $"#{svcName}.dialers" };
-                //var dialRoles = new Roles() { $"#{svcName}.dialers" };
-                //var bindRoles = new Roles() { $"#{svcName}.binders" };
+                var dialRoles = new Roles() { $"#{svcName}.dialers" };
+                var bindRoles = new Roles() { $"#{svcName}.binders" };
 
                 await h.DeleteServicePolicyByNameAsync($"{svcName}.sp.dial");
                 var createServicePolicy = new ServicePolicyCreate {
@@ -157,8 +155,8 @@ public static async Task Main(string[] args) {
                 string tempFilePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
                 System.IO.File.WriteAllBytes(tempFilePath, Encoding.UTF8.GetBytes(zitiId));
 
-                //Console.WriteLine("Waiting 10 seconds for router to receive the service");
-                //await Task.Delay(10000);
+                Console.WriteLine("Waiting 10 seconds for router to receive the service");
+                await Task.Delay(10000);
 
                 var c = new ZitiContext(tempFilePath);
                 var zitiSocketHandler = c.NewZitiSocketHandler(svcName);

diff --git a/TestProject/Properties/launchSettings.json.back b/TestProject/Properties/launchSettings.json.back
@@ -0,0 +1,17 @@
+{
+  "profiles": {
+    "TestProject": {
+      "commandName": "Project",
+      "commandLineArgs": "args0 test weather c:\\git\\github\\openziti\\ziti-sdk-csharp\\Samples\\setup-scripts\\enroll.demo.json",
+      "environmentVariables": {
+        "ZITI_USERNAME": "admin",
+        "ZITI_PASSWORD": "cdaws8086"
+      },
+      "nativeDebugging": true
+    },
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    }
+  }
+}