vmware-samples · lamw · Aug 4, 2023 · Jul 18, 2023
diff --git a/examples/knative/go/kn-go-nsx-tag-sync/function.yaml b/examples/knative/go/kn-go-nsx-tag-sync/function.yaml
@@ -60,7 +60,7 @@ spec:
   broker: default
   filter:
     attributes:
-      subject: com.vmware.cis.tagging.attach
+      type: com.vmware.vsphere.com.vmware.cis.tagging.attach.v0
   subscriber:
     ref:
       apiVersion: v1
@@ -80,7 +80,7 @@ spec:
   broker: default
   filter:
     attributes:
-      subject: com.vmware.cis.tagging.detach
+      type: com.vmware.vsphere.com.vmware.cis.tagging.detach.v0
   subscriber:
     ref:
       apiVersion: v1

diff --git a/examples/knative/go/kn-go-preemption/function.yaml b/examples/knative/go/kn-go-preemption/function.yaml
@@ -39,7 +39,7 @@ spec:
   broker: default
   filter:
     attributes:
-      subject: AlarmStatusChangedEvent
+      type: com.vmware.vsphere.AlarmStatusChangedEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/go/kn-go-tagging/function.yaml b/examples/knative/go/kn-go-tagging/function.yaml
@@ -44,8 +44,7 @@ spec:
   broker: default
   filter:
     attributes:
-      subject: VmPoweredOffEvent
-      type: com.vmware.event.router/event
+      type: com.vmware.vsphere.VmPoweredOffEvent.v0
   subscriber:
     ref:
       apiVersion: v1

diff --git a/examples/knative/powercli/kn-pcli-datastore-usage-email/function.yaml b/examples/knative/powercli/kn-pcli-datastore-usage-email/function.yaml
@@ -30,10 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      type: com.vmware.event.router/event
-      # Replace this subject with the event you need to trigger on
-      # Then, edit send-cloudevent-test.ps1 and send-cloudevent-test.sh in the /test folder
-      subject: AlarmStatusChangedEvent
+      type: com.vmware.vsphere.AlarmStatusChangedEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-datastore-usage-email/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-datastore-usage-email/test/send-cloudevent-test.ps1
@@ -1,5 +1,4 @@
 # The ce-subject value should match the event router subject in function.yaml
-$subject = "AlarmStatusChangedEvent"
 $payloadPath = "./test-payload.json"
 
 if ( $args.Count -gt 0 ) {
@@ -21,8 +20,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "id-123";
     "ce-source" = "source-123";
-    "ce-type" = "com.vmware.event.router/event";
-    "ce-subject" = $($subject);
+    "ce-type" = "com.vmware.vsphere.AlarmStatusChangedEvent.v0";
 }
 $body = Get-Content -Raw -Path $payloadPath
 

diff --git a/examples/knative/powercli/kn-pcli-datastore-usage-email/test/send-cloudevent-test.sh b/examples/knative/powercli/kn-pcli-datastore-usage-email/test/send-cloudevent-test.sh
@@ -22,8 +22,7 @@ curl -d@$PAYLOAD_PATH \
     -H 'ce-specversion: 1.0' \
     -H 'ce-id: d70079f9-fddd-4b7f-aa76-1193f28b0611' \
     -H 'ce-source: https://vcenter.local/sdk' \
-    -H 'ce-type: com.vmware.event.router/event' \
-    -H 'ce-subject: '$SUBJECT \
+    -H 'ce-type: com.vmware.vsphere.AlarmStatusChangedEvent.v0' \
     -X POST localhost:8080
 
 echo "See docker container console for output"
diff --git a/examples/knative/powercli/kn-pcli-ha-restarted-vms/function.yaml b/examples/knative/powercli/kn-pcli-ha-restarted-vms/function.yaml
@@ -30,10 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      type: com.vmware.event.router/eventex
-      # Replace this subject with the event you need to trigger on
-      # Then, edit send-cloudevent-test.ps1 and send-cloudevent-test.sh in the /test folder
-      subject: com.vmware.vc.HA.ClusterFailoverActionCompletedEvent
+      type: com.vmware.vsphere.com.vmware.vc.HA.ClusterFailoverActionCompletedEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-ha-restarted-vms/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-ha-restarted-vms/test/send-cloudevent-test.ps1
@@ -1,5 +1,4 @@
 # The ce-subject value should match the event router subject in function.yaml
-$subject = "com.vmware.vc.HA.ClusterFailoverActionCompletedEvent"
 $payloadPath = "./test-payload.json"
 
 if ( $args.Count -gt 0 ) {
@@ -21,8 +20,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "id-123";
     "ce-source" = "source-123";
-    "ce-type" = "com.vmware.event.router/eventex";
-    "ce-subject" = $($subject);
+    "ce-type" = "com.vmware.vsphere.com.vmware.vc.HA.ClusterFailoverActionCompletedEvent.v0";
 }
 $body = Get-Content -Raw -Path $payloadPath
 

diff --git a/examples/knative/powercli/kn-pcli-ha-restarted-vms/test/send-cloudevent-test.sh b/examples/knative/powercli/kn-pcli-ha-restarted-vms/test/send-cloudevent-test.sh
@@ -3,7 +3,6 @@
 # The ce-subject value should match the event router subject in function.yaml
 echo "Testing Function ..."
 PAYLOAD_PATH="test-payload.json"
-SUBJECT="com.vmware.vc.HA.ClusterFailoverActionCompletedEvent"
 
 if [ $# -gt 0 ]; then
     if test -f "$1"; then
@@ -22,8 +21,7 @@ curl -d@$PAYLOAD_PATH \
     -H 'ce-specversion: 1.0' \
     -H 'ce-id: d70079f9-fddd-4b7f-aa76-1193f28b0611' \
     -H 'ce-source: https://vcenter.local/sdk' \
-    -H 'ce-type: com.vmware.event.router/eventex' \
-    -H 'ce-subject: '$SUBJECT \
+    -H 'ce-type: com.vmware.vsphere.com.vmware.vc.HA.ClusterFailoverActionCompletedEvent.v0' \
     -X POST localhost:8080
 
 echo "See docker container console for output"
diff --git a/examples/knative/powercli/kn-pcli-hostmaint-alarms/function.yaml b/examples/knative/powercli/kn-pcli-hostmaint-alarms/function.yaml
@@ -12,7 +12,7 @@ spec:
         autoscaling.knative.dev/minScale: "1"
     spec:
       containers:
-        - image: us.gcr.io/daisy-284300/veba/kn-pcli-hostmaint-alarms:1.1
+        - image: us.gcr.io/daisy-284300/veba/kn-pcli-hostmaint-alarms:1.2
           envFrom:
             - secretRef:
                 name: hostmaint-secret
@@ -30,10 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      type: com.vmware.event.router/event
-      # Replace this subject with the event you need to trigger on
-      # Then, edit send-cloudevent-test.ps1 and send-cloudevent-test.sh in the /test folder
-      subject: ExitMaintenanceModeEvent
+      type: com.vmware.vsphere.ExitMaintenanceModeEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1
@@ -50,10 +47,7 @@ spec:
   broker: default
   filter:
     attributes:
-      type: com.vmware.event.router/event
-      # Replace this subject with the event you need to trigger on
-      # Then, edit send-cloudevent-test.ps1 and send-cloudevent-test.sh in the /test folder
-      subject: EnteredMaintenanceModeEvent
+      type: com.vmware.vsphere.EnteredMaintenanceModeEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-hostmaint-alarms/handler.ps1 b/examples/knative/powercli/kn-pcli-hostmaint-alarms/handler.ps1
@@ -76,7 +76,7 @@ Function Process-Handler {
    }
 
    if (${env:FUNCTION_DEBUG} -eq "true") {
-      Write-Host "$(Get-Date) - DEBUG: Event - $($cloudEvent.subject)"
+      Write-Host "$(Get-Date) - DEBUG: Event - $($cloudEvent.type)"
    }
    $hostName = $cloudEventData.Host.Name
    $moRef = New-Object VMware.Vim.ManagedObjectReference
@@ -99,7 +99,7 @@ Function Process-Handler {
       throw $_
    }
 
-   if ($cloudEvent.subject -eq "EnteredMaintenanceModeEvent") {
+   if ($cloudEvent.type -eq "com.vmware.vsphere.EnteredMaintenanceModeEvent.v0") {
       # Disable alarm actions on the host
       Write-Host "$(Get-Date) - Disabling alarm actions on host: $hostName"
       try {
@@ -111,7 +111,7 @@ Function Process-Handler {
       }
    }
 
-   if ($cloudEvent.subject -eq "ExitMaintenanceModeEvent") {
+   if ($cloudEvent.type -eq "com.vmware.vsphere.ExitMaintenanceModeEvent.v0") {
       # Enable alarm actions on the host
       Write-Host "$(Get-Date) - Enabling alarm actions on host: $hostName"
       try {

diff --git a/examples/knative/powercli/kn-pcli-hostmaint-alarms/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-hostmaint-alarms/test/send-cloudevent-test.ps1
@@ -1,5 +1,4 @@
 # The ce-subject value should match the event router subject in function.yaml
-$subject = "EnteredMaintenanceModeEvent"
 $payloadPath = "./enter-maint-payload.json"
 
 if ( $args.Count -gt 0 ) {
@@ -21,8 +20,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "id-123";
     "ce-source" = "source-123";
-    "ce-type" = "com.vmware.event.router/event";
-    "ce-subject" = $($subject);
+    "ce-type" = "com.vmware.vsphere.EnteredMaintenanceModeEvent.v0";
 }
 $body = Get-Content -Raw -Path $payloadPath
 

diff --git a/examples/knative/powercli/kn-pcli-hostmaint-alarms/test/send-cloudevent-test.sh b/examples/knative/powercli/kn-pcli-hostmaint-alarms/test/send-cloudevent-test.sh
@@ -3,7 +3,6 @@
 # The ce-subject value should match the event router subject in function.yaml
 echo "Testing Function ..."
 PAYLOAD_PATH="enter-maint-payload.json"
-SUBJECT="EnteredMaintenanceModeEvent"
 
 if [ $# -gt 0 ]; then
     if test -f "$1"; then
@@ -22,8 +21,7 @@ curl -d@$PAYLOAD_PATH \
     -H 'ce-specversion: 1.0' \
     -H 'ce-id: d70079f9-fddd-4b7f-aa76-1193f28b0611' \
     -H 'ce-source: https://vcenter.local/sdk' \
-    -H 'ce-type: com.vmware.event.router/event' \
-    -H 'ce-subject: '$SUBJECT \
+    -H 'ce-type: com.vmware.vsphere.EnteredMaintenanceModeEvent.v0' \
     -X POST localhost:8080
 
 echo "See docker container console for output"
diff --git a/examples/knative/powercli/kn-pcli-nsx-tag-sync/function.yaml b/examples/knative/powercli/kn-pcli-nsx-tag-sync/function.yaml
@@ -30,7 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      subject: com.vmware.cis.tagging.attach
+      subject: com.vmware.vsphere.com.vmware.cis.tagging.attach.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1
@@ -47,7 +47,7 @@ spec:
   broker: default
   filter:
     attributes:
-      subject: com.vmware.cis.tagging.detach
+      subject: com.vmware.vsphere.com.vmware.cis.tagging.detach.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-nsx-tag-sync/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-nsx-tag-sync/test/send-cloudevent-test.ps1
@@ -4,8 +4,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "d70079f9-fddd-4b7f-aa76-1193f28b0611";
     "ce-source" = "https://vcenter.local/sdk";
-    "ce-type" = "com.vmware.event.router/eventex";
-    "ce-subject" = "com.vmware.cis.tagging.attach";
+    "ce-type" = "com.vmware.vsphere.com.vmware.cis.tagging.attach.v0";
 }
 
 $body = Get-Content -Raw -Path "./test-payload.json"

diff --git a/examples/knative/powercli/kn-pcli-nsx-tag-sync/test/send-cloudevent-test.sh b/examples/knative/powercli/kn-pcli-nsx-tag-sync/test/send-cloudevent-test.sh
@@ -6,8 +6,7 @@ curl [email protected] \
     -H 'ce-specversion: 1.0' \
     -H 'ce-id: d70079f9-fddd-4b7f-aa76-1193f28b0611' \
     -H 'ce-source: https://vcenter.local/sdk' \
-    -H 'ce-type: com.vmware.event.router/eventex' \
-    -H 'ce-subject: com.vmware.cis.tagging.attach' \
+    -H 'ce-type: com.vmware.vsphere.com.vmware.cis.tagging.attach.v0' \
     -X POST localhost:8080
 
 echo "See docker container console for output"
diff --git a/examples/knative/powercli/kn-pcli-pg-check/function.yaml b/examples/knative/powercli/kn-pcli-pg-check/function.yaml
@@ -12,7 +12,7 @@ spec:
         autoscaling.knative.dev/minScale: "1"
     spec:
       containers:
-        - image: us.gcr.io/daisy-284300/veba/kn-pcli-pg-check:1.1
+        - image: us.gcr.io/daisy-284300/veba/kn-pcli-pg-check:1.2
           envFrom:
             - secretRef:
                 name: pg-check-secret
@@ -30,10 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      type: com.vmware.event.router/event
-      # Replace this subject with the event you need to trigger on
-      # Then, edit send-cloudevent-test.ps1 and send-cloudevent-test.sh in the /test folder
-      subject: VmReconfiguredEvent
+      type: com.vmware.vsphere.VmReconfiguredEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-pg-check/handler.ps1 b/examples/knative/powercli/kn-pcli-pg-check/handler.ps1
@@ -268,7 +268,7 @@ Function Process-Handler {
             fields = @(
                @{
                      title = "EventType";
-                     value = $cloudEvent.Subject;
+                     value = $cloudEvent.Type;
                      short = "false";
                }
                @{

diff --git a/examples/knative/powercli/kn-pcli-pg-check/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-pg-check/test/send-cloudevent-test.ps1
@@ -4,8 +4,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "id-123";
     "ce-source" = "source-123";
-    "ce-type" = "com.vmware.event.router/event";
-    "ce-subject" = "VmReconfiguredEvent";
+    "ce-type" = "com.vmware.vsphere.VmReconfiguredEvent.v0";
 }
 
 $payloadPath = "./test-payload.json"

diff --git a/examples/knative/powercli/kn-pcli-pg-check/test/send-cloudevent-test.sh b/examples/knative/powercli/kn-pcli-pg-check/test/send-cloudevent-test.sh
@@ -16,8 +16,7 @@ curl -d@$PAYLOAD_PATH \
     -H 'ce-specversion: 1.0' \
     -H 'ce-id: d70079f9-fddd-4b7f-aa76-1193f28b0611' \
     -H 'ce-source: https://vcenter.local/sdk' \
-    -H 'ce-type: com.vmware.event.router/event' \
-    -H 'ce-subject: VmReconfiguredEvent' \
+    -H 'ce-type: com.vmware.vsphere.VmReconfiguredEvent.v0' \
     -X POST localhost:8080
 
 echo "See docker container console for output"
diff --git a/examples/knative/powercli/kn-pcli-tag/function.yaml b/examples/knative/powercli/kn-pcli-tag/function.yaml
@@ -30,8 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      type: com.vmware.event.router/event
-      subject: DrsVmPoweredOnEvent
+      type: com.vmware.vsphere.DrsVmPoweredOnEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-tag/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-tag/test/send-cloudevent-test.ps1
@@ -4,8 +4,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "id-123";
     "ce-source" = "source-123";
-    "ce-type" = "com.vmware.event.router/event";
-    "ce-subject" = "DrsVmPoweredOnEvent";
+    "ce-type" = "com.vmware.vsphere.DrsVmPoweredOnEvent.v0";
 }
 
 $body = Get-Content -Raw -Path "./test-payload.json"

diff --git a/examples/knative/powercli/kn-pcli-tag/test/send-cloudevent-test.sh b/examples/knative/powercli/kn-pcli-tag/test/send-cloudevent-test.sh
@@ -6,8 +6,7 @@ curl [email protected] \
     -H 'ce-specversion: 1.0' \
     -H 'ce-id: d70079f9-fddd-4b7f-aa76-1193f28b0611' \
     -H 'ce-source: https://vcenter.local/sdk' \
-    -H 'ce-type: com.vmware.event.router/event' \
-    -H 'ce-subject: DrsVmPoweredOnEvent' \
+    -H 'ce-type: com.vmware.vsphere.DrsVmPoweredOnEvent.v0' \
     -X POST localhost:8080
 
 echo "See docker container console for output"
diff --git a/examples/knative/powercli/kn-pcli-telegram/function.yaml b/examples/knative/powercli/kn-pcli-telegram/function.yaml
@@ -30,7 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      subject: VmMigratedEvent
+      subject: com.vmware.vsphere.VmMigratedEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-telegram/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-telegram/test/send-cloudevent-test.ps1
@@ -4,8 +4,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "41289fef-0727-46f7-b1a9-b8145972c734";
     "ce-source" = "https://vcenter.local/sdk";
-    "ce-type" = "com.vmware.event.router/event";
-    "ce-subject" = "VmMigratedEvent";
+    "ce-type" = "com.vmware.vsphere.VmMigratedEvent.v0";
 }
 
 $body = Get-Content -Raw -Path "./test-payload.json"

diff --git a/examples/knative/powercli/kn-pcli-telegram/test/send-cloudevent-test.sh b/examples/knative/powercli/kn-pcli-telegram/test/send-cloudevent-test.sh
@@ -6,8 +6,7 @@ curl -i -vvv [email protected] \
     -H 'ce-specversion: 1.0' \
     -H 'ce-id: 41289fef-0727-46f7-b1a9-b8145972c734' \
     -H 'ce-source: https://vcenter.local/sdk' \
-    -H 'ce-type: com.vmware.event.router/event' \
-    -H 'ce-subject: VmMigratedEvent' \
+    -H 'ce-type: com.vmware.vsphere.VmMigratedEvent.v0' \
     -X POST localhost:8080
 
 echo "See docker container console for output"
diff --git a/examples/knative/powercli/kn-pcli-template/function.yaml b/examples/knative/powercli/kn-pcli-template/function.yaml
@@ -30,10 +30,7 @@ spec:
   broker: default
   filter:
     attributes:
-      type: com.vmware.event.router/event
-      # Replace this subject with the event you need to trigger on
-      # Then, edit send-cloudevent-test.ps1 and send-cloudevent-test.sh in the /test folder
-      subject: DvsReconfiguredEvent
+      type: com.vmware.vsphere.DvsReconfiguredEvent.v0
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1

diff --git a/examples/knative/powercli/kn-pcli-template/test/send-cloudevent-test.ps1 b/examples/knative/powercli/kn-pcli-template/test/send-cloudevent-test.ps1
@@ -1,5 +1,4 @@
 # The ce-subject value should match the event router subject in function.yaml
-$subject = "DvsReconfiguredEvent"
 $payloadPath = "./test-payload.json"
 
 if ( $args.Count -gt 0 ) {
@@ -21,8 +20,7 @@ $headers = @{
     "ce-specversion" = "1.0";
     "ce-id" = "id-123";
     "ce-source" = "source-123";
-    "ce-type" = "com.vmware.event.router/event";
-    "ce-subject" = $($subject);
+    "ce-type" = "com.vmware.vsphere.DvsReconfiguredEvent.v0";
 }
 $body = Get-Content -Raw -Path $payloadPath