Unverified Commit 64eccb69 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #152 from pastorsx/sp_dev_wais_oas3 

WAI service v2 using oas 3.0 yaml file
parents 319b1e8d 1c95eb18

.meepctl-repocfg.yaml

+0 −8
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ repo: 
          - sandbox.go-apps.meep-loc-serv

          - sandbox.go-apps.meep-rnis

          - sandbox.go-apps.meep-wais

          - packages.go-packages.meep-wais-notification-client

          - sandbox.go-apps.meep-metrics-engine

          - packages.go-packages.meep-metrics-engine-notification-client

          - sandbox.go-apps.meep-mg-manager
@@ -740,13 +739,6 @@ repo: 
        src: go-packages/meep-wais-client

        # supports linting

        lint: false

      meep-wais-notification-client:

        # location of source code

        src: go-packages/meep-wais-notification-client

        # supports linting

        lint: false

        # location of API specification

        api: go-packages/meep-wais-notification-client/api/swagger.yaml

      meep-watchdog:

        # location of source code

        src: go-packages/meep-watchdog

go-apps/meep-rnis/server/rnis.go

+6 −3
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ func subscriptionsGet(w http.ResponseWriter, r *http.Request) { 


	default:

		log.Error("Unknown subscription type")

		http.Error(w, "Unknown subscription type", http.StatusInternalServerError)

		w.WriteHeader(http.StatusBadRequest)

		return

	}
@@ -1214,6 +1214,9 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { 
		jsonResponse, err = json.Marshal(subscription)



	default:

		nextSubscriptionIdAvailable--

		w.WriteHeader(http.StatusBadRequest)

		return

	}



	//processing the error of the jsonResponse
@@ -1334,6 +1337,8 @@ func subscriptionsPut(w http.ResponseWriter, r *http.Request) { 
			jsonResponse, err = json.Marshal(subscription)

		}

	default:

		w.WriteHeader(http.StatusBadRequest)

		return

	}



	if alreadyRegistered {
@@ -1804,8 +1809,6 @@ func subscriptionLinkListSubscriptionsGet(w http.ResponseWriter, r *http.Request 
	q := u.Query()

	subType := q.Get("subscription_type")



	//var response SubscriptionLinkList



	response := createSubscriptionLinkList(subType)



	jsonResponse, err := json.Marshal(response)

go-apps/meep-rnis/server/rnis_test.go

+0 −2
Original line number Diff line number Diff line
@@ -1819,8 +1819,6 @@ func TestPlmnInfoGet(t *testing.T) { 
		t.Fatalf("Failed to get expected response")

	}



	log.Info("SIMON ", string(rr), "---", err)



	if len(plmnInfoList) != 0 {

		if plmnInfoList[0].Plmn[0].Mcc != expectedMcc[INITIAL] {

			t.Fatalf("Failed to get expected response")

go-apps/meep-wais/api/swagger.yaml

+2131 −2654

File changed.

Preview size limit exceeded, changes collapsed.

go-apps/meep-wais/go.mod

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sessions v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-notification-client v0.0.0

	github.com/antihax/optional v1.0.0 // indirect

	github.com/gorilla/handlers v1.4.0

	github.com/gorilla/mux v1.7.4
@@ -34,5 +33,4 @@ replace ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sessions => ../../go-packages/meep-sessions

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client => ../../go-packages/meep-wais-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-notification-client => ../../go-packages/meep-wais-notification-client

)