Commit af59b50a authored by supermikii's avatar supermikii
Browse files

modify demo3 mec service update on notification

parent d26629ff

examples/demo3/src/backend/server/demo3_service.go

+107 −52
Original line number Diff line number Diff line
@@ -116,39 +116,39 @@ func startTicker() { 
			}



			// Error handling if cannot retrieve mec services

			discoveredServices, err := getMecServices()

			if err != nil {

				log.Error("Error polling mec services")

				// Display on activity log

				appActivityLogs = append(appActivityLogs, "Cannot retrieve mec services app will now shut down, please restart scenario!")

			// discoveredServices, err := getMecServices()

			// if err != nil {

			// 	log.Error("Error polling mec services")

			// 	// Display on activity log

			// 	appActivityLogs = append(appActivityLogs, "Cannot retrieve mec services app will now shut down, please restart scenario!")



				// Terminate graceful shutdown

				Terminate()

			// 	// Terminate graceful shutdown

			// 	Terminate()



				// Kill program

				done <- true

				return

			}

			// 	// Kill program

			// 	done <- true

			// 	return

			// }



			// Clean discovered services

			demoAppInfo.DiscoveredServices = []ApplicationInstanceDiscoveredServices{}

			// demoAppInfo.DiscoveredServices = []ApplicationInstanceDiscoveredServices{}



			// Store discovered service name into app info model

			// Store service as a map using service name as key and url as value

			// to lookup url using service name in O(1)

			mecServicesMap = make(map[string]string)

			var tempService ApplicationInstanceDiscoveredServices

			for _, e := range discoveredServices {

				tempService.SerName = e.SerName

				tempService.SerInstanceId = e.SerInstanceId

				tempService.ConsumedLocalOnly = e.ConsumedLocalOnly

				tempService.Link = e.TransportInfo.Endpoint.Uris[0]

				tempService.Version = e.TransportInfo.Version

			// mecServicesMap = make(map[string]string)

			// var tempService ApplicationInstanceDiscoveredServices

			// for _, e := range discoveredServices {

			// 	tempService.SerName = e.SerName

			// 	tempService.SerInstanceId = e.SerInstanceId

			// 	tempService.ConsumedLocalOnly = e.ConsumedLocalOnly

			// 	tempService.Link = e.TransportInfo.Endpoint.Uris[0]

			// 	tempService.Version = e.TransportInfo.Version



				demoAppInfo.DiscoveredServices = append(demoAppInfo.DiscoveredServices, tempService)

			// 	demoAppInfo.DiscoveredServices = append(demoAppInfo.DiscoveredServices, tempService)



				mecServicesMap[tempService.SerName] = tempService.Link

			}

			// 	mecServicesMap[tempService.SerName] = tempService.Link

			// }

		}

	}()

}
@@ -167,6 +167,7 @@ func Init(envPath string, envName string) (port string, err error) { 
		environment = "sandbox"



		mecUrl = config.SandboxUrl



		// check if mec url is running behind https

		if config.HttpsOnly {

			if !strings.HasPrefix(mecUrl, "https://") {
@@ -178,7 +179,7 @@ func Init(envPath string, envName string) (port string, err error) { 
			}

		}



		if !strings.HasSuffix(mecUrl, "/") {

		if strings.HasSuffix(mecUrl, "/") {

			mecUrl = strings.TrimSuffix(mecUrl, "/")

		}
@@ -201,7 +202,7 @@ func Init(envPath string, envName string) (port string, err error) { 
	if !strings.HasPrefix(localUrl, "http://") {

		localUrl = "http://" + localUrl

	}

	if !strings.HasSuffix(localUrl, "/") {

	if strings.HasSuffix(localUrl, "/") {

		localUrl = strings.TrimSuffix(localUrl, "/")

	}
@@ -310,6 +311,41 @@ func demo3Register(w http.ResponseWriter, r *http.Request) { 
		// Check if app is successfully registered

		appActivityLogs = append(appActivityLogs, "=== Register Demo3 MEC Application ["+demoRegisteratonStatus+"]")



		var err error



		// Register demo app service

		registeredService, errors := registerService(instanceName, callBackUrl)

		if errors != nil {

			appActivityLogs = append(appActivityLogs, "Error registering MEC service")

			http.Error(w, errors.Error(), http.StatusInternalServerError)

			return

		} else {

			serviceRegistered = true

		}



		discoveredServices, err := getMecServices()

		if err != nil {



		}

		demoAppInfo.DiscoveredServices = []ApplicationInstanceDiscoveredServices{}



		// Store discovered service name into app info model

		// Store service as a map using service name as key and url as value

		// to lookup url using service name in O(1)

		mecServicesMap = make(map[string]string)

		var tempService ApplicationInstanceDiscoveredServices

		for _, e := range discoveredServices {

			tempService.SerName = e.SerName

			tempService.SerInstanceId = e.SerInstanceId

			tempService.ConsumedLocalOnly = e.ConsumedLocalOnly

			tempService.Link = e.TransportInfo.Endpoint.Uris[0]

			tempService.Version = e.TransportInfo.Version



			demoAppInfo.DiscoveredServices = append(demoAppInfo.DiscoveredServices, tempService)



			mecServicesMap[tempService.SerName] = tempService.Link

		}



		// Send confirm ready

		confirmErr := sendReadyConfirmation(instanceName)

		if confirmErr != nil {
@@ -333,6 +369,7 @@ func demo3Register(w http.ResponseWriter, r *http.Request) { 


		// Subscribe to service availability

		svcCallBackReference := callBackUrl + "/services/callback/service-availability"



		svcSubscriptionId, err := subscribeAvailability(instanceName, svcCallBackReference)

		if err == nil {

			svcSubscriptionSent = true
@@ -343,16 +380,6 @@ func demo3Register(w http.ResponseWriter, r *http.Request) { 
		serSubscription.SubId = svcSubscriptionId

		subscriptions.SerAvailabilitySubscription = &serSubscription



		// Register demo app service

		registeredService, errors := registerService(instanceName, callBackUrl)

		if errors != nil {

			appActivityLogs = append(appActivityLogs, "Error registering MEC service")

			http.Error(w, errors.Error(), http.StatusInternalServerError)

			return

		} else {

			serviceRegistered = true

		}



		// Store demo app service into app info model

		var serviceLocality = LocalityType(scopeOfLocality)

		var state = ServiceState("ACTIVE")
@@ -636,11 +663,18 @@ func demo3Deregister(w http.ResponseWriter, r *http.Request) { 


// REST API handle service subscription callback notification

func serviceAvailNotificationCallback(w http.ResponseWriter, r *http.Request) {



	// Decode request body

	var notification smc.ServiceAvailabilityNotification

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&notification)

	// Parse request param to show on logs

	if err != nil {

		log.Error(err)

		w.WriteHeader(http.StatusInternalServerError)

		fmt.Fprintf(w, "Error Decoding Notification")

	}

	log.Info("Received service availability notification")



	msg := ""

	if notification.ServiceReferences[0].ChangeType == "ADDED" {

		msg = "Available"
@@ -648,14 +682,37 @@ func serviceAvailNotificationCallback(w http.ResponseWriter, r *http.Request) { 
		msg = "Unavailable"

	}



	if msg == "Available" {

		// Retrieve MEC service by serviceId

		serviceId := notification.ServiceReferences[0].SerInstanceId

		svcInfo, _, err := srvMgmtClient.MecServiceMgmtApi.ServicesServiceIdGET(context.TODO(), serviceId)

		if err != nil {

		log.Error(err.Error())

		http.Error(w, err.Error(), http.StatusInternalServerError)

			log.Error(err)

			w.WriteHeader(http.StatusInternalServerError)

			fmt.Fprintf(w, "Error Retrieving MEC Services")

			appActivityLogs = append(appActivityLogs, mep+" Event: Service Availability change, "+notification.ServiceReferences[0].SerName+" service "+msg+" [500]")

		return

		}



	log.Info("Received service availability notification")

		// Update Discovered Service

		tempService := ApplicationInstanceDiscoveredServices{

			SerName:           svcInfo.SerName,

			SerInstanceId:     svcInfo.SerInstanceId,

			ConsumedLocalOnly: svcInfo.ConsumedLocalOnly,

			Link:              svcInfo.TransportInfo.Endpoint.Uris[0],

			Version:           svcInfo.TransportInfo.Version,

		}

		demoAppInfo.DiscoveredServices = append(demoAppInfo.DiscoveredServices, tempService)

		mecServicesMap[tempService.SerName] = tempService.Link

	} else {

		// Remove Service from Discovered Service

		for i, e := range demoAppInfo.DiscoveredServices {

			if e.SerName == notification.ServiceReferences[0].SerName {

				demoAppInfo.DiscoveredServices = append(demoAppInfo.DiscoveredServices[:i], demoAppInfo.DiscoveredServices[i+1:]...)

				return

			}

		}

		delete(mecServicesMap, notification.ServiceReferences[0].SerName)

	}



	state := ""

	if *notification.ServiceReferences[0].State == smc.ACTIVE_ServiceState {
@@ -1281,7 +1338,7 @@ func Terminate() { 
			//Delete app subscriptions

			err := delAppTerminationSubscription(instanceName, demoAppInfo.Subscriptions.AppTerminationSubscription.SubId)

			if err == nil {

				log.Info("Delete App-termination subscription")

				log.Info("Deleted App-termination subscription")

				demoAppInfo.Subscriptions.AppTerminationSubscription.SubId = ""

				appTerminationSent = false

			}
@@ -1290,9 +1347,7 @@ func Terminate() { 
			if svcSubscriptionSent {

				err := delsubscribeAvailability(instanceName, demoAppInfo.Subscriptions.SerAvailabilitySubscription.SubId)

				if err == nil {

					log.Info("line 1050")



					log.Info("Delete Service-avail subscription")

					log.Info("Deleted Service-avail subscription")

					svcSubscriptionSent = false

					demoAppInfo.Subscriptions.SerAvailabilitySubscription.SubId = ""

				}
@@ -1303,7 +1358,7 @@ func Terminate() { 
				err := unregisterService(instanceName, appEnablementServiceId)

				if err == nil {



					log.Info("Delete Demo3 service")

					log.Info("Deleted Demo3 service")

					serviceRegistered = false

					demoAppInfo.OfferedService = nil

				}
@@ -1314,7 +1369,7 @@ func Terminate() { 
				err := delAmsService(amsResourceId)

				if err == nil {



					log.Info("Delete AMS resource")

					log.Info("Deleted AMS resource")

					amsServiceCreated = false

					demoAppInfo.AmsResource = false

				}
@@ -1326,7 +1381,7 @@ func Terminate() { 
				err := deleteAmsSubscription(demoAppInfo.Subscriptions.AmsLinkListSubscription.SubId)

				if err == nil {



					log.Info("Delete AMS subscription")

					log.Info("Deleted AMS subscription")

					demoAppInfo.Subscriptions.AmsLinkListSubscription.SubId = ""

					amsSubscriptionSent = false

				}

examples/demo3/src/backend/util/mep2.yaml

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
mode: 'sandbox'

sandbox: 'http://10.190.115.162/sbx-gh-miki/mep1'

mecplatform: 'mep1'

appid: 'e36bbc4f-11d3-4526-abf4-7b2a922c7685'

localurl: 'http://10.190.115.162'

port: '8093'

examples/demo3/src/frontend/.env

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
ENVIRONMENT=

URL=

examples/demo3/src/frontend/src/index.html

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ limitations under the License. 


    <title>MEEP Demo 3</title>



    <link rel="icon" type="image/svg+xml" href="img/ID-Icon-01-idcc-blue.svg" />

    <link rel="icon" type="image/svg+xml" href="./img/ID-Icon-01-idcc-blue.svg" />



    <link

      rel="stylesheet"
@@ -39,7 +39,7 @@ limitations under the License. 
    <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> -->

  </head>



  <body class="mdc-typography ui-body">

  <body class="mdc-typography ui-body ui-background"">

    <div id="demo-controller"></div>

  </body>

</html>

examples/demo3/src/frontend/src/js/containers/Homepage.js

+45 −52
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import { TextField } from '@rmwc/textfield'; 
import Container from '@mui/material/Container';

import { createTheme, ThemeProvider } from '@mui/material/styles';







// custom package

import Header from '@/js/components/Layout/Header';

import ActivityPane from '@/js/components/Pane/AppInfo';
@@ -37,17 +35,13 @@ import * as demoSvcRestApiClient from '../../../../client/src/index.js'; 
// import css

import '@/css/global.css';





export default function Homepage() {

  // MEEP Demo REST API JS Client

  // Configure server url based on environmental variable externally or preset internally



  var basepath;

  if (process.env.ENVIRONMENT === 'SANDBOX') {

    basepath = 'http://' + process.env.URL;

  } else {

 

  basepath = 'http://' + location.host + location.pathname;

  }

  



  demoSvcRestApiClient.ApiClient.instance.basePath = basepath.replace(
@@ -66,7 +60,6 @@ export default function Homepage() { 
  const [registered, setRegisteration] = useState(false);

  const [start, setStart] = useState(false);

  const [modal, setModal] = useState(false);

  const [amsStart, setAmsStart] = useState(false);

  const [amsModal, setAmsModal] = useState(false);



  // Inital loading
@@ -80,12 +73,15 @@ export default function Homepage() { 
    });

  }, []);



 

  var i = 0;

  // If app is registered & added terminal device

  // Perform polling on ams

  useEffect(() => {

    if (registered) {

      i++;

      console.log(i);

      const interval = setInterval(() => {

        console.log('hi');

        appInfoApi.getAmsDevices((error, data, response) => {

          if (error !== null) {

            console.log(error);
@@ -102,6 +98,7 @@ export default function Homepage() { 
  // Perform polling on app info

  useEffect(() => {

    if (registered) {

      console.log('bye  ');

      const interval = setInterval(() => {

        appInfoApi.getPlatformInfo((error, data, response) => {

          if (error != null) {
@@ -119,6 +116,7 @@ export default function Homepage() { 
  // Peform polling activity logs

  useEffect(() => {

    if (registered) {

      console.log('zzz');

      const interval = setInterval(() => {

        appInfoApi.getActivityLogs((error, data, response) => {

          if (error != null) {
@@ -169,7 +167,7 @@ export default function Homepage() { 
      if (err != null) {

        console.log(err);

      } else {

        const result = mutableArray.filter(e => e != device );

        const result = mutableArray.filter((e) => e != device);

        setTerminalDevices(result);

      }

    });
@@ -183,7 +181,7 @@ export default function Homepage() { 
        if (err != null) {

          console.log(err);

        } else {

          setTerminalDevices(e => [... e, textValue]); 

          setTerminalDevices((e) => [...e, textValue]);

        }

      });

    }
@@ -191,16 +189,15 @@ export default function Homepage() { 


  return (

    <ThemeProvider theme={theme}>

      <div className="ui-background" style={{ height: '100%' }}>

      <div>

        <Header></Header>

        <Container maxWidth="100vw" sx={{ mt: 2, mb: 4 }}>

        <Container maxWidth="100vw" sx={{ mt: 2 }}>

          <Grid style={styles.headlineGrid}>

            <GridCell span="5">

              <ActivityPane data={appInfo}></ActivityPane>

            </GridCell>

            <GridCell span="2">

              <div>

            

                <Button

                  outlined

                  color="themecolor"
@@ -209,21 +206,18 @@ export default function Homepage() { 
                  variant="contained"

                  sx={{ mt: 3, mb: 2 }}

                  onClick={() => {

                    appInfoApi.register(

                      (err, data, resp) => {

                        if (err != null) {

                    appInfoApi.register((err, data, resp) => {

                      if (err !== null) {

                        console.log(err);

                      } else {

                        setAppInfo(resp.body);

                        setRegisteration(true);

                      }

                      }

                    );

                    });

                  }}

                >

                  Register Application

                </Button>

            

              </div>

              <div>

                <Button
@@ -300,8 +294,7 @@ export default function Homepage() { 
                  <DialogButton

                    action="accept"

                    isDefaultAction

                    onClick={(e) => {

                      setAmsStart(true);

                    onClick={() => {

                      addTerminalDevices();

                    }}

                  >
@@ -353,9 +346,9 @@ export default function Homepage() { 
                </DialogActions>

              </Dialog>

            </GridCell>

            <GridCell span="5">

            <GridCell span="5" className={{ height: '100vh' }}>

              <LogPane data={appLog}></LogPane>

              <AmsPane data={amsLog} style={{ marginTop: '5px' }}></AmsPane>

              <AmsPane data={amsLog}></AmsPane>

            </GridCell>

          </Grid>

        </Container>