From b2b175eae0f4e8b5b0cb9ccbeeca1e98065feeb5 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Fri, 15 Mar 2019 15:18:12 -0700 Subject: Update definition and profile to latest spec Bringing all the definition and profile code upto the latest spec. Integrated the end to end instance code changes that were made. P9: Added updated plugin.sh with updated uri paths based on spec Issue-ID: MULTICLOUD-291 Change-Id: Id6e3c6bc2cd02cfb7005e203ccf03e0793b97e95 Signed-off-by: Kiran Kamineni --- src/k8splugin/api/api.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/k8splugin/api/api.go') diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go index 67a91282..2862a999 100644 --- a/src/k8splugin/api/api.go +++ b/src/k8splugin/api/api.go @@ -30,29 +30,27 @@ func NewRouter(kubeconfig string, defClient rb.DefinitionManager, vnfInstanceHandler.HandleFunc("/{cloudRegionID}/{namespace}/{externalVNFID}", DeleteHandler).Methods("DELETE") vnfInstanceHandler.HandleFunc("/{cloudRegionID}/{namespace}/{externalVNFID}", GetHandler).Methods("GET") - //rbd is resource bundle definition + //Setup resource bundle definition routes if defClient == nil { defClient = rb.NewDefinitionClient() } defHandler := rbDefinitionHandler{client: defClient} resRouter := router.PathPrefix("/v1/rb").Subrouter() resRouter.HandleFunc("/definition", defHandler.createHandler).Methods("POST") - resRouter.HandleFunc("/definition/{rbdID}/content", defHandler.uploadHandler).Methods("POST") - resRouter.HandleFunc("/definition", defHandler.listHandler).Methods("GET") - resRouter.HandleFunc("/definition/{rbdID}", defHandler.getHandler).Methods("GET") - resRouter.HandleFunc("/definition/{rbdID}", defHandler.deleteHandler).Methods("DELETE") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}/content", defHandler.uploadHandler).Methods("POST") + resRouter.HandleFunc("/definition/{rbname}", defHandler.listVersionsHandler).Methods("GET") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}", defHandler.getHandler).Methods("GET") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}", defHandler.deleteHandler).Methods("DELETE") - //rbp is resource bundle profile + //Setup resource bundle profile routes if profileClient == nil { profileClient = rb.NewProfileClient() } profileHandler := rbProfileHandler{client: profileClient} - resRouter.HandleFunc("/profile", profileHandler.createHandler).Methods("POST") - resRouter.HandleFunc("/profile/{rbpID}/content", profileHandler.uploadHandler).Methods("POST") - resRouter.HandleFunc("/profile/help", profileHandler.helpHandler).Methods("GET") - resRouter.HandleFunc("/profile", profileHandler.listHandler).Methods("GET") - resRouter.HandleFunc("/profile/{rbpID}", profileHandler.getHandler).Methods("GET") - resRouter.HandleFunc("/profile/{rbpID}", profileHandler.deleteHandler).Methods("DELETE") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile", profileHandler.createHandler).Methods("POST") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}/content", profileHandler.uploadHandler).Methods("POST") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}", profileHandler.getHandler).Methods("GET") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}", profileHandler.deleteHandler).Methods("DELETE") // (TODO): Fix update method // vnfInstanceHandler.HandleFunc("/{vnfInstanceId}", UpdateHandler).Methods("PUT") -- cgit 1.2.3-korg