2022-02-18

mobiledgex · Feb 18, 2022 · cd5e655 · cd5e655
1 parent 5aae666
commit cd5e655
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [2022-02-18] - Feb 18, 2022
+[Details](../../commit/2022-02-18)
+
+### edge-cloud:
+- [EDGECLOUD-6155](https://mobiledgex.atlassian.net/browse/EDGECLOUD-6155): Unable to add federation cloudlets to cloudlet pool ([#1650](https://github.com/mobiledgex/edge-cloud/pull/1650)) (Ashish Jain)
+
+### edge-cloud-infra:
+- [EDGECLOUD-6155](https://mobiledgex.atlassian.net/browse/EDGECLOUD-6155): Unable to add federation cloudlets to cloudlet pool ([#1962](https://github.com/mobiledgex/edge-cloud-infra/pull/1962)) (Ashish Jain)
+
 ## [2022-02-17] - Feb 17, 2022
 [Details](../../commit/2022-02-17)
 

diff --git a/edge-cloud b/edge-cloud
diff --git a/edge-cloud-infra b/edge-cloud-infra
+3 −2		cloud-resource-manager/cmd/crmserver/crm_server_test.go
+12 −17		cloud-resource-manager/crmutil/controller-data.go
+1 −1		cloudcommon/node/events_test.go
+3 −3		controller/addrefs_test.go
+17 −12		controller/cloudletpool_api.go
+58 −36		controller/cloudletpool_api_test.go
+1 −1		controller/delete_test.go
+61 −0		controller/upgrade_funcs.go
+6 −0		controller/upgrade_testfiles/AddCloudletKeyToCloudletPool_post.etcd
+6 −0		controller/upgrade_testfiles/AddCloudletKeyToCloudletPool_pre.etcd
+2 −0		controller/version.auto.go
+1 −1		edgeproto/alert.pb.go
+1 −1		edgeproto/caches.go
+178 −110		edgeproto/cloudletpool.pb.go
+8 −6		edgeproto/cloudletpool.proto
+1 −5		edgeproto/objs.go
+82 −72		edgeproto/version.pb.go
+2 −1		edgeproto/version.proto
+8 −3		gencmd/alldata.cmd.go
+30 −16		gencmd/cloudletpool.cmd.go
+2 −1		setup-env/e2e-tests/data/appdata_trustpolicyexception_create.yml
+2 −1		setup-env/e2e-tests/data/appdata_trustpolicyexception_delete.yml
+2 −1		setup-env/e2e-tests/data/trustpolicyexception_create_show.yml
+2 −1		setup-env/e2e-tests/data/trustpolicyexception_update_tpe1_active_show.yml
+2 −1		setup-env/e2e-tests/data/trustpolicyexception_update_tpe1_portrange_show.yml
+2 −1		setup-env/e2e-tests/data/trustpolicyexception_update_tpe1_rejected_show.yml
+4 −4		testutil/cloudletpool_custom.go
+5 −1		testutil/dummy_server.go
+6 −6		testutil/test_data.go
+2 −1		e2e-tests/data/mc_admin_show.yml
+4 −2		e2e-tests/data/mc_user1_cloudlet_data.yml
+4 −2		e2e-tests/data/mc_user1_data_show.yml
+4 −2		e2e-tests/data/mc_user1_federated_data_show.yml
+39 −21		mc/mcctl/ormctl/cloudletpool.mc2.go
+3 −0		mc/orm/alert.mc2.go
+1 −5		mc/orm/authz_cloudlet.go
+5 −9		mc/orm/authz_cloudletpool.go
+1 −5		mc/orm/authz_show.go
+2 −2		mc/orm/billing_usage.go
+1 −1		mc/orm/cloudletpool_usage.go
+5 −5		mc/orm/ctrl_test.go
+4 −4		mc/orm/influx.go
+3 −3		mc/orm/reporter.go