Commit 99fbb71e authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in mec-federation

parent 5811f559

charts/meep-dai/templates/onboardedapp-pv.yaml

+12 −15
Original line number Diff line number Diff line
@@ -4,31 +4,28 @@ apiVersion: v1 
metadata:

  name: meep-dai-onboardedapp-pv

spec:

  storageClassName: meep-dai-onboardedapp-sc

  storageClassName: nfs

  volumeMode: Filesystem

  capacity:

    storage: 100Mi

  accessModes:

    - ReadWriteOnce

  persistentVolumeReclaimPolicy: Retain

  hostPath:

    path: {{ .Values.onboardedapp.location }}



---

kind: StorageClass

apiVersion: storage.k8s.io/v1

metadata:

  name: meep-dai-onboardedapp-sc

provisioner: kubernetes.io/no-provisioner

volumeBindingMode: WaitForFirstConsumer

    - ReadWriteMany

  persistentVolumeReclaimPolicy: Recycle

  mopuntOptions:

    - hard

    - nfsvers=4.1

  nfs:

    server: 172.29.10.52

    path: /mnt/nfs/mec_sandbox

---

kind: PersistentVolumeClaim

apiVersion: v1

metadata:

  name: meep-dai-onboardedapp-pvc

spec:

  storageClassName: meep-dai-onboardedapp-sc

  storageClassName: nfs

  accessModes:

    - ReadWriteOnce

    - ReadWriteMany

  resources:

    requests:

      storage: 100Mi

go-apps/meep-federation/go.mod

+1 −2
Original line number Diff line number Diff line 
module github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-vis

module github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-federation



go 1.12



require (

	github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-federation v0.0.0-00010101000000-000000000000

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0 // indirect

go-apps/meep-federation/server/federation.go

+7 −2
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ func Init() (err error) { 
	fed_broker := strings.TrimSpace(os.Getenv("MEEP_BROKER"))

	log.Info("MEEP_BROKER: ", fed_broker)



	// Get FED topic. E.g. ETSI/MEC/FED

	// Get FED topic. E.g. ETSI/MEC/Federation

	fed_topic := strings.TrimSpace(os.Getenv("MEEP_TOPIC"))

	log.Info("MEEP_TOPIC: ", fed_topic)
@@ -773,7 +773,7 @@ func systeminfoGET(w http.ResponseWriter, r *http.Request) { 
			return

		}

		var systemInfos = []SystemInfo{}

		for _, val := range systemInfopMap {

		for _, val := range l {

			systemInfos = append(systemInfos, SystemInfo{

				SystemId:       val.SystemId,

				SystemName:     val.SystemName,
@@ -1299,6 +1299,11 @@ func fedNotify(msg string, systemId string) { 
		log.Error(err.Error())

		return

	}

	log.Debug("fedNotify: systemInfo: ", systemInfo)

	if systemInfo.SystemId == "" {

		log.Error("fedNotify: Invalid SystemId value")

		return

	}



	if systemInfo.SystemId != localSystemInfo.SystemId { // Do not notify on our registration

		// Populate systemInfopMap

go-apps/meep-federation/server/logger.go

+2 −2
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * AdvantEDGE V2X Information Service REST API

 * AdvantEDGE Federation enablement APIs REST API

 *

 * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](.https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/03.02.01_60/) <p>[Copyright (c) ETSI 2024](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about radio conditions in the network <p>**Note**<br>AdvantEDGE supports a selected subset of VIS API endpoints (see below) and a subset of subscription types.

 * Federation enablement APIs is AdvantEDGE's implementation of [ETSI GS MEC 040](.https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/03.02.01_60/) <p>[Copyright (c) ETSI 2024](https://forge.etsi.org/etsi-forge-copyright-notice.txt) <p>**Micro-service**<br>[meep-federation](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-federation) <p>**Type & Usage**<br>Edge Service used by edge applications that want to get information about radio conditions in the network <p>**Note**<br>AdvantEDGE supports a selected subset of Federation enablement APIs endpoints (see below) and a subset of subscription types.

 *

 * API version: 3.2.2

 * Contact: AdvantEDGE@InterDigital.com

go-packages/meep-federation-mgr/federation-mgr.go

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ type FederationMgr struct { 
	connected      bool

	mutex          sync.Mutex

	message_broker message_broker_interface

	// updateCb  func(string, string)

}



// Enable profiling
@@ -87,6 +86,7 @@ func (fm *FederationMgr) DeleteFederationMgr(systemId string) (err error) { 
		}

	}



	// Stop MQTT server

	fm.StopFedMessageBrokerServer()



	return nil