Move hardcoded IPs to model
Change-Id: I045366ea3eec1f0f23570c4eff62d9c977c10b80
(cherry picked from commit a42532af5eec25e774c45210be3126aa5d30df44)
diff --git a/xos/models/venb.xproto b/xos/models/venb.xproto
index e021cc7..f40ce7e 100644
--- a/xos/models/venb.xproto
+++ b/xos/models/venb.xproto
@@ -5,6 +5,8 @@
option verbose_name = "Virtual eNodeB Service";
required string login_user = 1 [help_text = "vENB VM login user", default = "cfguser", max_length = 32, content_type = "stripped", null = False, db_index = False, blank = False];
required string login_password = 2 [help_text = "vENB VM login password", default = "cfguser", max_length = 32, content_type = "stripped", null = False, db_index = False, blank = False];
+ required string tas_ip = 3 [help_text = "TAS IP address", default = "103.0.0.100", max_length = 32, null = False, db_index = False, blank = False];
+ required string ntp_ip = 4 [help_text = "NTP server IP address", default = "193.0.0.222", max_length = 32, null = False, db_index = False, blank = False];
}
message VENBServiceInstance (TenantWithContainer){
diff --git a/xos/synchronizer/steps/sync_venbserviceinstance.py b/xos/synchronizer/steps/sync_venbserviceinstance.py
index 2e30ecd..19ff9d5 100644
--- a/xos/synchronizer/steps/sync_venbserviceinstance.py
+++ b/xos/synchronizer/steps/sync_venbserviceinstance.py
@@ -53,6 +53,8 @@
service = self.get_service(o)
fields['login_user'] = service.login_user
fields['login_password'] = service.login_password
+ fields['tas_ip'] = service.tas_ip
+ fields['ntp_ip'] = service.ntp_ip
return fields
def get_ip_address(self, network_name, service_instance, parameter):
diff --git a/xos/synchronizer/steps/venbserviceinstance_playbook.yaml b/xos/synchronizer/steps/venbserviceinstance_playbook.yaml
index 298d1ad..1cbd67f 100644
--- a/xos/synchronizer/steps/venbserviceinstance_playbook.yaml
+++ b/xos/synchronizer/steps/venbserviceinstance_playbook.yaml
@@ -22,8 +22,8 @@
- ts_mask: "255.255.255.0"
- ts_gateway: "103.0.0.254"
- ts_host_name: "{{ instance_name }}"
- - tas_ip: "103.0.0.100"
- - ntp_ip: "193.0.0.222"
+ - tas_ip: "{{ tas_ip }}"
+ - ntp_ip: "{{ ntp_ip }}"
- password: "{{ login_password }}"
roles:
- ts_config