rsarwad · rsarwad · Feb 27, 2020 · Feb 27, 2020 · Feb 27, 2020 · Mar 12, 2020
diff --git a/cwf/cloud/go/plugin/handlers/handlers_test.go b/cwf/cloud/go/plugin/handlers/handlers_test.go
@@ -296,7 +296,7 @@ func TestCwfGateways(t *testing.T) {
 	_ = plugin.RegisterPluginForTests(t, &pluginimpl.BaseOrchestratorPlugin{})
 	_ = plugin.RegisterPluginForTests(t, &plugin2.CwfOrchestratorPlugin{})
 	clock.SetAndFreezeClock(t, time.Unix(1000000, 0))
-	defer clock.GetUnfreezeClockDeferFunc(t)()
+	defer clock.UnfreezeClock(t)
 	test_init.StartTestService(t)
 	stateTestInit.StartTestService(t)
 	deviceTestInit.StartTestService(t)

diff --git a/cwf/cloud/go/protos/ue_sim.pb.go b/cwf/cloud/go/protos/ue_sim.pb.go
diff --git a/cwf/gateway/configs/magmad.yml b/cwf/gateway/configs/magmad.yml
@@ -49,12 +49,9 @@ bootstrap_config:
 enable_config_streamer: True
 enable_upgrade_manager: True
 enable_network_monitor: True
-enable_systemd_tailer: False
 enable_sync_rpc: True
 enable_kernel_version_checking: True
 
-systemd_tailer_poll_interval: 30 # seconds
-
 upgrader_factory:
   module: magma.magmad.upgrade.docker_upgrader
   class: DockerUpgraderFactory

diff --git a/cwf/gateway/configs/redirectd.yml b/cwf/gateway/configs/redirectd.yml
@@ -9,6 +9,4 @@
 
 log_level: INFO
 
-scribe_logging_enabled: False
-
 http_port: 8080
diff --git a/cwf/gateway/docker/.env b/cwf/gateway/docker/.env
@@ -13,7 +13,6 @@ IMAGE_VERSION=latest
 
 BUILD_CONTEXT=../../..
 
-CERTS_PATH=../../../.cache/test_certs/
 ROOTCA_PATH=../../../.cache/test_certs/rootCA.pem
 CONTROL_PROXY_PATH=../configs/control_proxy.yml
 CONFIGS_TEMPLATES_PATH=../../../orc8r/gateway/configs/templates

diff --git a/cwf/gateway/docker/docker-compose.integ-test.yml b/cwf/gateway/docker/docker-compose.integ-test.yml
@@ -61,9 +61,6 @@ services:
   sessiond:
     volumes:
       - ../integ_tests/sessiond.yml:/etc/magma/sessiond.yml
-    extra_hosts:
-      - controller.magma.test:127.0.0.1
-      - bootstrapper-controller.magma.test:127.0.0.1
 
   swx_proxy:
     <<: *feggoservice
@@ -106,38 +103,8 @@ services:
       /bin/bash -c "/usr/bin/redis-server /var/opt/magma/redis.conf --daemonize no &&
              /usr/bin/redis-cli shutdown"
 
-  control_proxy:
-    extra_hosts:
-      - controller.magma.test:127.0.0.1
-      - bootstrapper-controller.magma.test:127.0.0.1
-    command: >
-      sh -c "mkdir -p /usr/share/ca-certificates/extra/ &&
-             cp -f /var/opt/magma/certs/rootCA.pem /usr/share/ca-certificates/extra/ &&
-             echo \"extra/rootCA.pem\" >> /etc/ca-certificates.conf && update-ca-certificates &&
-             /usr/local/bin/generate_nghttpx_config.py &&
-            /usr/bin/env nghttpx --conf /var/opt/magma/tmp/nghttpx.conf /var/opt/magma/certs/controller.key /var/opt/magma/certs/controller.crt"
-
-  magmad:
-    extra_hosts:
-      - controller.magma.test:127.0.0.1
-      - bootstrapper-controller.magma.test:127.0.0.1
-
   uesim:
     <<: *service
     container_name: uesim
     image: ${DOCKER_REGISTRY}uesim:${IMAGE_VERSION}
     command: envdir /var/opt/magma/envdir /var/opt/magma/bin/uesim -logtostderr=true -v=0
-
-  ingress:
-    <<: *service
-    container_name: ingress
-    image: nginx:latest
-    extra_hosts:
-      - controller.magma.test:127.0.0.1
-      - bootstrapper-controller.magma.test:127.0.0.1
-      - session-proxy.magma.test:127.0.0.1
-      - sessiond.magma.test:127.0.0.1
-    volumes:
-      - ../integ_tests/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ${CERTS_PATH}/:/etc/nginx/certs/
-    command: /usr/sbin/nginx -g "daemon off;"
diff --git a/cwf/gateway/integ_tests/README.md b/cwf/gateway/integ_tests/README.md
@@ -63,4 +63,4 @@ to see specific errors.
 
 &rightarrow; Since docker does not garbage collect previously built images, we 
 will have to manually prune them. Run `docker system df` to see memory usage 
-and what can be deleted. To remove these images, run `docker system prune to docker image prune --filter until=24h`.
+and what can be deleted. To remove these images, run `docker system prune to docker image prune --filter until=24h`.
diff --git a/cwf/gateway/integ_tests/auth_ul_test.go b/cwf/gateway/integ_tests/auth_ul_test.go
@@ -14,9 +14,11 @@ import (
 	"testing"
 
 	"fbc/lib/go/radius/rfc2869"
+	cwfprotos "magma/cwf/cloud/go/protos"
 	"magma/feg/gateway/services/eap"
 
 	"github.com/go-openapi/swag"
+	"github.com/golang/protobuf/ptypes/wrappers"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -39,7 +41,8 @@ func TestAuthenticateUplinkTraffic(t *testing.T) {
 	assert.NotNil(t, eapMessage)
 	assert.True(t, reflect.DeepEqual(int(eapMessage[0]), eap.SuccessCode))
 
-	err = tr.GenULTraffic(ue.GetImsi(), swag.String("100K"))
+	req := &cwfprotos.GenTrafficRequest{Imsi: ue.GetImsi(), Volume: &wrappers.StringValue{Value: *swag.String("100K")}}
+	_, err = tr.GenULTraffic(req)
 	assert.NoError(t, err)
 
 	// Clear hss, ocs, and pcrf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,4 @@

		log_level: INFO

		scribe_logging_enabled: False

		http_port: 8080