diff options
| author |   Kiran Kamineni <kiran.k.kamineni@intel.com> | 2018-10-31 16:24:32 -0700 |
|---|---|---|
| committer |   Victor Morales <victor.morales@intel.com> | 2018-11-08 17:07:59 -0800 |
| commit | 7d2d48d3d0b35de0acd03c6e8a1261efd736edc3 (patch) | |
| tree | cdfc546b98fbea5df408f620387499984a78469f /src/k8splugin/api/handler.go | |
| parent | 985a6654725e3931737f1a0831bd3b44a0d99a28 (diff) | |
Add vnf definition APIs3.0.0-ONAPcasablanca
Adding APIs for POST, GET, LIST (implemented via GET)
and DELETE commands on /v1/vnfd base for creating,
getting, listing and deleting VNF Definitions.
P2: Added unit tests for vnfdhandler.go
P3: Add unit tests for serialize and deserialize
P4: Integrating review comments
P5: Added customizable mocking for vnfdhandler_test
P6: Added customizablt mocking for vnfd_test
Note that this will soon need to be updated once
the db changes go through in patch 71090
Issue-ID: MULTICLOUD-393
Change-Id: Id509bed370ab3bdc572c6ead22324c1ee3dbf82d
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
Signed-off-by: Victor Morales <victor.morales@intel.com>
Diffstat (limited to 'src/k8splugin/api/handler.go')
| -rw-r--r-- | src/k8splugin/api/handler.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/k8splugin/api/handler.go b/src/k8splugin/api/handler.go index 4635e7ba..b4828b76 100644 --- a/src/k8splugin/api/handler.go +++ b/src/k8splugin/api/handler.go @@ -118,13 +118,12 @@ func CreateHandler(w http.ResponseWriter, r *http.Request) { // krd.AddNetworkAnnotationsToPod(kubeData, resource.Networks) // "{"deployment":<>,"service":<>}" - out, err := json.Marshal(resourceNameMap) + serializedResourceNameMap, err := db.Serialize(resourceNameMap) if err != nil { werr := pkgerrors.Wrap(err, "Create VNF deployment JSON Marshalling error") http.Error(w, werr.Error(), http.StatusInternalServerError) return } - serializedResourceNameMap := string(out) // key: cloud1-default-uuid // value: "{"deployment":<>,"service":<>}" @@ -232,7 +231,7 @@ func DeleteHandler(w http.ResponseWriter, r *http.Request) { }, */ deserializedResourceNameMap := make(map[string][]string) - err = json.Unmarshal([]byte(serializedResourceNameMap), &deserializedResourceNameMap) + err = db.DeSerialize(serializedResourceNameMap, &deserializedResourceNameMap) if err != nil { werr := pkgerrors.Wrap(err, "Delete VNF error") http.Error(w, werr.Error(), http.StatusInternalServerError) @@ -357,7 +356,7 @@ func GetHandler(w http.ResponseWriter, r *http.Request) { }, */ deserializedResourceNameMap := make(map[string][]string) - err = json.Unmarshal([]byte(serializedResourceNameMap), &deserializedResourceNameMap) + err = db.DeSerialize(serializedResourceNameMap, &deserializedResourceNameMap) if err != nil { werr := pkgerrors.Wrap(err, "Get VNF error") http.Error(w, werr.Error(), http.StatusInternalServerError) |