diff --git a/dev_env_data/plugin-registry/plugin-store.json b/dev_env_data/plugin-registry/plugin-store.json index 48da2b3945a6fb5eea20bbe9c3aba01d0f169065..a9bb0f660a3891baf4e1931c9c9b337e862a9c66 100644 --- a/dev_env_data/plugin-registry/plugin-store.json +++ b/dev_env_data/plugin-registry/plugin-store.json @@ -1 +1 @@ -[{"id":"e2c358b3-6482-4010-b0d8-679dff73153b","path":"plugins/arista/bundled_plugin.zip","hash":"h1:+ORKoJds8/v25xH4uvd3pPqa1eIs6JXHw/Ef4HMtG6A=","manifest":{"name":"Arista","firmware":"standard","author":"goSDN-Team","version":"1.0.0"}},{"id":"d1c269a2-6482-4010-b0d8-679dff73153b","path":"plugins/openconfig/bundled_plugin.zip","hash":"h1:FpK0b9SSrly8IJMfhbgt/Q8k3f4V5tRlIEX7K9btMrI=","manifest":{"name":"Openconfig","firmware":"standard","author":"goSDN-Team","version":"1.0.0"}}] +[{"id":"e2c358b3-6482-4010-b0d8-679dff73153b","path":"plugins/arista/bundled_plugin.zip","manifest":{"name":"Arista","firmware":"standard","author":"goSDN-Team","version":"1.0.0"}},{"id":"d1c269a2-6482-4010-b0d8-679dff73153b","path":"plugins/openconfig/bundled_plugin.zip","manifest":{"name":"Openconfig","firmware":"standard","author":"goSDN-Team","version":"1.0.0"}}] diff --git a/plugin-registry/main.go b/plugin-registry/main.go index d492f8ddb64f3a36781196aef1ac496b1df1cea9..4c0e334d58230bc0f4bce1549eea853d210b6d32 100644 --- a/plugin-registry/main.go +++ b/plugin-registry/main.go @@ -11,7 +11,6 @@ import ( "code.fbi.h-da.de/danet/gosdn/controller/interfaces/plugin" "code.fbi.h-da.de/danet/gosdn/controller/nucleus/util" "github.com/google/uuid" - "golang.org/x/mod/sumdb/dirhash" "google.golang.org/grpc" ) @@ -66,15 +65,9 @@ func registerPlugins() *PluginRegistry { panic(err) } - zipPath := filepath.Join(dirPath, util.BundledPluginName) - zipHashed, err := dirhash.HashZip(zipPath, dirhash.DefaultHash) - if err != nil { - panic(err) - } - var plugin *Plugin for i, p := range plugins { - if p.Hash == zipHashed { + if *p.Manifest == *manifest { plugin = p plugins[i] = plugins[len(plugins)-1] plugins = plugins[:len(plugins)-1] @@ -86,7 +79,6 @@ func registerPlugins() *PluginRegistry { plugin = &Plugin{ ID: uuid.New(), Path: filepath.Join(dirPath, util.BundledPluginName), - Hash: zipHashed, Manifest: manifest, } } diff --git a/plugin-registry/registry.go b/plugin-registry/registry.go index e4d9c569144ae2341061856fe1b2be488b4f5732..b658b3142ce2f42f0475388d377d938fb9e9aa65 100644 --- a/plugin-registry/registry.go +++ b/plugin-registry/registry.go @@ -11,7 +11,6 @@ import ( type Plugin struct { ID uuid.UUID `json:"id,omitempty"` Path string `json:"path,omitempty"` - Hash string `json:"hash,omitempty"` Manifest *plugin.Manifest `json:"manifest,omitempty"` }