X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fsimulator-group%2Fdmaapmr%2Fsvc.yaml;h=446c59da5a25cd7c491e17d20696f4e402c727cf;hb=79e37003f5c94bfe12d197727dd31334e50397a6;hp=e5d5d8e566f9fe627337e4e2ee4c5612300e70be;hpb=663566c28930429775ea9921f0e32ddf5253da28;p=nonrtric.git

diff --git a/test/simulator-group/dmaapmr/svc.yaml b/test/simulator-group/dmaapmr/svc.yaml
index e5d5d8e5..446c59da 100644
--- a/test/simulator-group/dmaapmr/svc.yaml
+++ b/test/simulator-group/dmaapmr/svc.yaml
@@ -1,135 +1,59 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: $MR_DMAAP_KUBE_APP_NAME
+  name: $MR_ZOOKEEPER_APP_NAME
   namespace: $KUBE_ONAP_NAMESPACE
   labels:
-    run: $MR_DMAAP_KUBE_APP_NAME
+    run: $MR_ZOOKEEPER_APP_NAME
     autotest: DMAAPMR
 spec:
   type: ClusterIP
   ports:
-  - port: $MR_EXTERNAL_PORT
-    targetPort: $MR_INTERNAL_PORT
+  - port: $MR_ZOOKEEPER_PORT
+    targetPort: $MR_ZOOKEEPER_PORT
     protocol: TCP
     name: http
-  - port: $MR_EXTERNAL_SECURE_PORT
-    targetPort: $MR_INTERNAL_SECURE_PORT
-    protocol: TCP
-    name: https
   selector:
-    run: $MR_DMAAP_KUBE_APP_NAME
+    run: $MR_ZOOKEEPER_APP_NAME
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: $MR_KAFKA_BWDS_NAME
+  name: $MR_KAFKA_APP_NAME
   namespace: $KUBE_ONAP_NAMESPACE
   labels:
-    run: $MR_KAFKA_BWDS_NAME
+    run: $MR_KAFKA_APP_NAME
     autotest: DMAAPMR
 spec:
   type: ClusterIP
   ports:
-  - port: 9092
-    targetPort: 9095
+  - port: $MR_KAFKA_PORT
+    targetPort: $MR_KAFKA_PORT
     protocol: TCP
     name: http
   selector:
-    run: $MR_KAFKA_BWDS_NAME
+    run: $MR_KAFKA_APP_NAME
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: $MR_ZOOKEEPER_APP_NAME
+  name: $MR_DMAAP_APP_NAME
   namespace: $KUBE_ONAP_NAMESPACE
   labels:
-    run: $MR_ZOOKEEPER_APP_NAME
+    run: $MR_DMAAP_APP_NAME
     autotest: DMAAPMR
 spec:
   type: ClusterIP
   ports:
-  - port: 2181
-    targetPort: 2181
+  - port: $MR_EXTERNAL_PORT
+    targetPort: $MR_INTERNAL_PORT
     protocol: TCP
     name: http
+  - port: $MR_EXTERNAL_SECURE_PORT
+    targetPort: $MR_INTERNAL_SECURE_PORT
+    protocol: TCP
+    name: https
   selector:
-    run: $MR_ZOOKEEPER_APP_NAME
+    run: $MR_DMAAP_APP_NAME
 
 
-# ---
-# apiVersion: v1
-# kind: Service
-# metadata:
-#   name: dmaap-mr
-#   namespace: $KUBE_ONAP_NAMESPACE
-#   labels:
-#     run: $MR_DMAAP_KUBE_APP_NAME
-#     autotest: DMAAPMR
-# spec:
-#   type: ClusterIP
-#   ports:
-#   - port: $MR_EXTERNAL_PORT
-#     targetPort: $MR_INTERNAL_PORT
-#     protocol: TCP
-#     name: http
-#   - port: $MR_EXTERNAL_SECURE_PORT
-#     targetPort: $MR_INTERNAL_SECURE_PORT
-#     protocol: TCP
-#     name: https
-#   selector:
-#     run: $MR_DMAAP_KUBE_APP_NAME
-# ---
-# apiVersion: v1
-# kind: Service
-# metadata:
-#   name: dmaap-kafka
-#   namespace: $KUBE_ONAP_NAMESPACE
-#   labels:
-#     run: $MR_KAFKA_BWDS_NAME
-#     autotest: DMAAPMR
-# spec:
-#   type: ClusterIP
-#   ports:
-#   - port: 9092
-#     targetPort: 9092
-#     protocol: TCP
-#     name: http
-#   selector:
-#     run: $MR_KAFKA_BWDS_NAME
-# ---
-# apiVersion: v1
-# kind: Service
-# metadata:
-#   name: kafka
-#   namespace: $KUBE_ONAP_NAMESPACE
-#   labels:
-#     run: $MR_KAFKA_BWDS_NAME
-#     autotest: DMAAPMR
-# spec:
-#   type: ClusterIP
-#   ports:
-#   - port: 9092
-#     targetPort: 9092
-#     protocol: TCP
-#     name: http
-#   selector:
-#     run: $MR_KAFKA_BWDS_NAME
-# ---
-# apiVersion: v1
-# kind: Service
-# metadata:
-#   name: dmaap-zookeeper
-#   namespace: $KUBE_ONAP_NAMESPACE
-#   labels:
-#     run: $MR_ZOOKEEPER_APP_NAME
-#     autotest: DMAAPMR
-# spec:
-#   type: ClusterIP
-#   ports:
-#   - port: 2181
-#     targetPort: 2181
-#     protocol: TCP
-#     name: http
-#   selector:
-    run: $MR_ZOOKEEPER_APP_NAME
\ No newline at end of file