elpinjo · tsvens · May 4, 2022 · May 4, 2022 · May 4, 2022 · May 4, 2022
diff --git a/Machines/Dockerfile b/Machines/Dockerfile
@@ -1,4 +1,4 @@
-FROM softwareag/webmethods-microservicesruntime:10.11.0.0
+FROM softwareag/webmethods-microservicesruntime:10.11.0.2
 MAINTAINER SoftwareAG
 
 USER root

diff --git a/Products/src/APIGW/productsWebService-archive.zip b/Products/src/APIGW/productsWebService-archive.zip
diff --git a/ServiceMonitor/Dockerfile b/ServiceMonitor/Dockerfile
@@ -1,4 +1,4 @@
-FROM softwareag/webmethods-microservicesruntime:10.11.0.0
+FROM softwareag/webmethods-microservicesruntime:10.11.0.2
 
 MAINTAINER SoftwareAG
 
@@ -7,5 +7,6 @@ USER root
 COPY ${PACKAGE} /opt/softwareag/IntegrationServer/packages/${PACKAGE}
 
 RUN chown 1724:1724 -R /opt/softwareag/IntegrationServer/packages/*
+RUN chown 1724:1724 /opt/softwareag/IntegrationServer/config/licenseKey.xml
 
 USER 1724
diff --git a/ServiceMonitor/Dockerfile.bak b/ServiceMonitor/Dockerfile.bak
@@ -0,0 +1,12 @@
+FROM softwareag/webmethods-microservicesruntime:10.11.0.0
+
+MAINTAINER SoftwareAG
+
+USER root
+
+COPY ${PACKAGE} /opt/softwareag/IntegrationServer/packages/${PACKAGE}
+COPY ISLicense.xml /opt/softwareag/IntegrationServer/config/licenseKey.xml
+
+RUN chown 1724:1724 -R /opt/softwareag/IntegrationServer/packages/*
+
+USER 1724
diff --git a/ServiceMonitor/Jenkinsfile b/ServiceMonitor/Jenkinsfile
@@ -35,13 +35,18 @@ spec:
     - /bin/cat
     tty: true
     volumeMounts:
+    - name: tmp-dir
+      mountPath: /wm-installer
     - name: docker-sock
       mountPath: /var/run/docker.sock
     - name: jenkins-docker-cfg
       mountPath: /root/.docker
     securityContext:
       privileged: true
   volumes:
+  - name: tmp-dir
+    hostPath:
+      path: "/tmp/license"
   - name: docker-sock
     hostPath:
       path: "/var/run/docker.sock"

diff --git a/ServiceMonitor/Jenkinsfile.bak b/ServiceMonitor/Jenkinsfile.bak
@@ -68,7 +68,7 @@ spec:
 		NAMESPACE = "api-first-workshop"
 		REGISTRY_INGRESS = "https://${params.REGISTRY}"
 		CONTAINER = "service-monitor-api"
-		CONTAINER_TAG = "1.0"
+		CONTAINER_TAG = "1.0.${env.BUILD_NUMBER}"
     }
 
     stages {
@@ -84,6 +84,7 @@ spec:
 						build/test/reports'
 					sh 'chmod -R go+w build/test'
 					sh 'cd build/container; \
+						cp /wm-installer/ISLicense.xml . ; \
 					    cp -r ${WORKSPACE}/${PACKAGE}/Dockerfile .; \
 						cp -r ${WORKSPACE}/${PACKAGE}/src/IS/${PACKAGE} .;'
 				}

diff --git a/ServiceMonitor/deployment/api-DC.yml b/ServiceMonitor/deployment/api-DC.yml
@@ -50,6 +50,9 @@ spec:
           volumeMounts:
             - name: config-volume
               mountPath: /opt/swagmsr/config
+#            - name: license-file
+#              mountPath: /opt/softwareag/IntegrationServer/config/licenseKey.xml
+#              subPath: ISLicense.xml              
           env:
             - name: "SAG_IS_CONFIG_PROPERTIES"
               value: "/opt/swagmsr/config/application.properties"
@@ -71,4 +74,7 @@ spec:
         - name: config-volume
           configMap:
             name: application-properties-is
-  replicas: 1
+#        - name: license-file
+#          configMap:
+#            name: msr-license            
+  replicas: 1
diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/node.ndf
@@ -6,19 +6,34 @@
   <value name="node_nsName">servicemonitor.apis:MachineIncidentAPI</value>
   <value name="node_pkg">ServiceMonitor</value>
   <value name="is_public">false</value>
+  <value name="sourceUri">https://sagdemo.apigw-aw-us.webmethods.io/rest/apigateway/apis/dd0c3a7c-ff02-4f51-9f3f-f2e9bdd8d3b6?format=swagger</value>
+  <value name="swaggerUrl">https://sagdemo.apigw-aw-us.webmethods.io/rest/apigateway/apis/dd0c3a7c-ff02-4f51-9f3f-f2e9bdd8d3b6?format=swagger</value>
+  <Boolean name="modifiable">false</Boolean>
+  <record name="securityDefinitions" javaclass="com.wm.util.Values">
+  </record>
+  <record name="security" javaclass="com.wm.util.Values">
+  </record>
+  <record name="restTags" javaclass="com.wm.util.Values">
+  </record>
   <record name="generalInfo" javaclass="com.wm.util.Values">
     <value name="specVersion">2.0</value>
-    <value name="hostName">beneluxint.gateway.webmethodscloud.com</value>
+    <value name="hostName">sagdemo.apigw-aw-us.webmethods.io</value>
     <value name="basePath">/gateway/MachineIncident/1.0</value>
     <array name="schemes" type="value" depth="1">
       <value>http</value>
     </array>
+    <array name="consumes" type="value" depth="1">
+      <value>application/json</value>
+    </array>
+    <array name="produces" type="value" depth="1">
+      <value>application/json</value>
+    </array>
     <record name="security" javaclass="com.wm.util.Values">
     </record>
   </record>
   <record name="appInfo" javaclass="com.wm.util.Values">
     <value name="appVersion">1.0</value>
-    <value name="description">Create incidents when machines are broken</value>
+    <value name="description">Create Incident when machine is broken</value>
     <value name="title">MachineIncident</value>
     <null name="termsOfService"/>
     <record name="contact" javaclass="com.wm.util.Values">
@@ -31,9 +46,6 @@
       <null name="licenseUrl"/>
     </record>
   </record>
-  <value name="sourceUri">file://C:\Users\mihe\Downloads\MachineIncident_swagger.json</value>
-  <value name="swaggerUrl">file:/C:/Users/mihe/Downloads/MachineIncident_swagger.json</value>
-  <Boolean name="modifiable">false</Boolean>
   <record name="restDefinitions" javaclass="com.wm.util.Values">
     <record name="servicemonitor.apis.MachineIncidentAPI_.docTypes:body" javaclass="com.wm.util.Values">
       <value name="name">body</value>
@@ -53,9 +65,11 @@
           <null name="refDefinition"/>
           <null name="definitionName"/>
           <Boolean name="includeInRad">true</Boolean>
+          <record name="customizedString" javaclass="com.wm.util.Values">
+          </record>
         </record>
-        <record name="machineId" javaclass="com.wm.util.Values">
-          <value name="name">machineId</value>
+        <record name="componentStatusDescriptor" javaclass="com.wm.util.Values">
+          <value name="name">componentStatusDescriptor</value>
           <value name="source">BODY</value>
           <value name="type">STRING</value>
           <null name="description"/>
@@ -65,9 +79,11 @@
           <null name="refDefinition"/>
           <null name="definitionName"/>
           <Boolean name="includeInRad">true</Boolean>
+          <record name="customizedString" javaclass="com.wm.util.Values">
+          </record>
         </record>
-        <record name="componentStatusDescription" javaclass="com.wm.util.Values">
-          <value name="name">componentStatusDescription</value>
+        <record name="machineId" javaclass="com.wm.util.Values">
+          <value name="name">machineId</value>
           <value name="source">BODY</value>
           <value name="type">STRING</value>
           <null name="description"/>
@@ -77,6 +93,8 @@
           <null name="refDefinition"/>
           <null name="definitionName"/>
           <Boolean name="includeInRad">true</Boolean>
+          <record name="customizedString" javaclass="com.wm.util.Values">
+          </record>
         </record>
         <record name="status" javaclass="com.wm.util.Values">
           <value name="name">status</value>
@@ -89,21 +107,17 @@
           <null name="refDefinition"/>
           <null name="definitionName"/>
           <Boolean name="includeInRad">true</Boolean>
+          <record name="customizedString" javaclass="com.wm.util.Values">
+          </record>
         </record>
       </record>
     </record>
   </record>
-  <record name="securityDefinitions" javaclass="com.wm.util.Values">
-  </record>
-  <record name="security" javaclass="com.wm.util.Values">
-  </record>
-  <record name="restTags" javaclass="com.wm.util.Values">
-  </record>
   <record name="pathOperations" javaclass="com.wm.util.Values">
     <record name="/incident" javaclass="com.wm.util.Values">
       <record name="POST" javaclass="com.wm.util.Values">
         <value name="operationType">POST</value>
-        <value name="nsName">servicemonitor.apis.MachineIncidentAPI_.connectors:fl38b55caf88995d476c5cb6</value>
+        <value name="nsName">servicemonitor.apis.MachineIncidentAPI_.connectors:incident_POST_1</value>
         <array name="consumes" type="value" depth="1">
           <value>application/json</value>
         </array>
@@ -113,7 +127,7 @@
             <value name="source">BODY</value>
             <value name="type">REFERENCE</value>
             <null name="description"/>
-            <Boolean name="isRequired">true</Boolean>
+            <Boolean name="isRequired">false</Boolean>
             <Boolean name="isArray">false</Boolean>
             <null name="defaultValue"/>
             <value name="refDefinition">servicemonitor.apis.MachineIncidentAPI_.docTypes:body</value>
@@ -145,7 +159,7 @@
   <array name="generatedServices" type="record" depth="1">
     <record javaclass="com.wm.util.Values">
       <value name="name">/incident_POST</value>
-      <value name="nsName">servicemonitor.apis.MachineIncidentAPI_.connectors:fl38b55caf88995d476c5cb6</value>
+      <value name="nsName">servicemonitor.apis.MachineIncidentAPI_.connectors:incident_POST_1</value>
     </record>
   </array>
   <array name="selectedOperations" type="record" depth="1">

diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/swagger b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/swagger
@@ -1,31 +1,35 @@
 ---
 swagger: "2.0"
 info:
-  description: "Create incidents when machines are broken\n"
+  description: "Create Incident when machine is broken"
   version: "1.0"
   title: "MachineIncident"
-host: "beneluxint.gateway.webmethodscloud.com"
+host: "sagdemo.apigw-aw-us.webmethods.io"
 basePath: "/gateway/MachineIncident/1.0"
 schemes:
 - "http"
+consumes:
+- "application/json"
+produces:
+- "application/json"
 security:
 - apiKey: []
 paths:
   /incident:
     post:
-      operationId: "fl38b55caf88995d476c5cb6"
+      operationId: "incident_POST_1"
       consumes:
       - "application/json"
       parameters:
       - in: "body"
         name: "body"
-        required: true
+        required: false
         schema:
           $ref: "#/definitions/body"
       responses:
-        200:
+        "200":
           description: "OK"
-        401:
+        "401":
           description: "Access Denied"
 securityDefinitions:
   apiKey:
@@ -37,15 +41,15 @@ definitions:
     type: "object"
     required:
     - "component"
-    - "componentStatusDescription"
+    - "componentStatusDescriptor"
     - "machineId"
     - "status"
     properties:
       component:
         type: "string"
-      machineId:
+      componentStatusDescriptor:
         type: "string"
-      componentStatusDescription:
+      machineId:
         type: "string"
       status:
         type: "string"
diff --git a/...nectors/fl38b55caf88995d476c5cb6/flow.xml → ...tAPI_/connectors/incident_POST_1/flow.xml b/...nectors/fl38b55caf88995d476c5cb6/flow.xml → ...tAPI_/connectors/incident_POST_1/flow.xml
@@ -47,7 +47,7 @@
   <DATA ENCODING="XMLValues" I18N="true">
 
 <Values version="2.0">
-  <value name="xml">beneluxint.gateway.webmethodscloud.com</value>
+  <value name="xml">sagdemo.apigw-aw-us.webmethods.io</value>
 </Values>
 </DATA>
 </MAPSET>
@@ -61,6 +61,15 @@
 </DATA>
 </MAPSET>
 
+<MAPSET OVERWRITE="false" VARIABLES="true" GLOBALVARIABLES="false" FIELD="/produces;1;0">
+  <DATA ENCODING="XMLValues" I18N="true">
+
+<Values version="2.0">
+  <value name="xml">application/json</value>
+</Values>
+</DATA>
+</MAPSET>
+
 <MAPSET OVERWRITE="false" VARIABLES="true" GLOBALVARIABLES="false" FIELD="/scheme;1;0">
   <DATA ENCODING="XMLValues" I18N="true">
 
@@ -94,7 +103,7 @@
 <MAPCOPY FROM="/auth;2;0/type;1;0" TO="/auth;2;0/type;1;0">
 </MAPCOPY>
 
-<MAPCOPY FROM="/body;4;0" TO="/body;2;0">
+<MAPCOPY FROM="/body;4;0;servicemonitor.apis.MachineIncidentAPI_.docTypes:body" TO="/body;2;0">
 </MAPCOPY>
 
 <MAPSET OVERWRITE="false" VARIABLES="true" GLOBALVARIABLES="false" FIELD="/radName;1;0">

diff --git a/...ors/fl38b55caf88995d476c5cb6/flow.xml.bak → ..._/connectors/incident_POST_1/flow.xml.bak b/...ors/fl38b55caf88995d476c5cb6/flow.xml.bak → ..._/connectors/incident_POST_1/flow.xml.bak
@@ -47,7 +47,7 @@
   <DATA ENCODING="XMLValues" I18N="true">
 
 <Values version="2.0">
-  <value name="xml">beneluxint.gateway.webmethodscloud.com</value>
+  <value name="xml">sagdemo.apigw-aw-us.webmethods.io</value>
 </Values>
 </DATA>
 </MAPSET>
@@ -61,6 +61,15 @@
 </DATA>
 </MAPSET>
 
+<MAPSET OVERWRITE="false" VARIABLES="true" GLOBALVARIABLES="false" FIELD="/produces;1;0">
+  <DATA ENCODING="XMLValues" I18N="true">
+
+<Values version="2.0">
+  <value name="xml">application/json</value>
+</Values>
+</DATA>
+</MAPSET>
+
 <MAPSET OVERWRITE="false" VARIABLES="true" GLOBALVARIABLES="false" FIELD="/scheme;1;0">
   <DATA ENCODING="XMLValues" I18N="true">
 
@@ -94,7 +103,7 @@
 <MAPCOPY FROM="/auth;2;0/type;1;0" TO="/auth;2;0/type;1;0">
 </MAPCOPY>
 
-<MAPCOPY FROM="/body;4;0" TO="/body;2;0">
+<MAPCOPY FROM="/body;4;0;servicemonitor.apis.MachineIncidentAPI_.docTypes:body" TO="/body;2;0">
 </MAPCOPY>
 
 <MAPSET OVERWRITE="false" VARIABLES="true" GLOBALVARIABLES="false" FIELD="/radName;1;0">