The default enpoint is still http
Issue-ID: MULTICLOUD-978
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I2bb8e64bfe5a26a183b3f8bb86ebd9c3ab9481b0
ENV MSB_ADDR "127.0.0.1"
ENV MSB_PORT "80"
ENV AAI_ADDR "aai.api.simpledemo.openecomp.org"
ENV MSB_ADDR "127.0.0.1"
ENV MSB_PORT "80"
ENV AAI_ADDR "aai.api.simpledemo.openecomp.org"
+MSB_SERVICE_PROTOCOL = 'http'
MSB_SERVICE_IP = 'msb.onap.org'
MSB_SERVICE_PORT = '10080'
MSB_SERVICE_IP = 'msb.onap.org'
MSB_SERVICE_PORT = '10080'
from multivimbroker.pub.config.config import AAI_SERVICE_URL
from multivimbroker.pub.config.config import AAI_USERNAME
from multivimbroker.pub.config.config import AAI_PASSWORD
from multivimbroker.pub.config.config import AAI_SERVICE_URL
from multivimbroker.pub.config.config import AAI_USERNAME
from multivimbroker.pub.config.config import AAI_PASSWORD
+from multivimbroker.pub.config.config import MSB_SERVICE_PROTOCOL
from multivimbroker.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2
from multivimbroker.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2
def req_by_msb(resource, method, content='', headers=None):
def req_by_msb(resource, method, content='', headers=None):
- base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+ base_url = "%s://%s:%s/" % (
+ MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
return call_req(base_url, "", "",
rest_no_auth, resource, method, content, headers)
def req_by_msb_multipart(resource, method, content, headers=None):
return call_req(base_url, "", "",
rest_no_auth, resource, method, content, headers)
def req_by_msb_multipart(resource, method, content, headers=None):
- base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+ base_url = "%s://%s:%s/" % (
+ MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
return call_multipart_req(base_url, "", "",
rest_no_auth, resource, method, content, headers)
return call_multipart_req(base_url, "", "",
rest_no_auth, resource, method, content, headers)
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
+sed -i "s/MSB_SERVICE_PROTOCOL =.*/MSB_SERVICE_PROTOCOL = \"${MSB_PROTO}\"/g" multivimbroker/pub/config/config.py
sed -i "s/MSB_SERVICE_IP =.*/MSB_SERVICE_IP = \"${MSB_ADDR}\"/g" multivimbroker/pub/config/config.py
sed -i "s/MSB_SERVICE_PORT =.*/MSB_SERVICE_PORT = \"${MSB_PORT}\"/g" multivimbroker/pub/config/config.py
sed -i "s/AAI_ADDR =.*/AAI_ADDR = \"${AAI_ADDR}\"/g" multivimbroker/pub/config/config.py
sed -i "s/MSB_SERVICE_IP =.*/MSB_SERVICE_IP = \"${MSB_ADDR}\"/g" multivimbroker/pub/config/config.py
sed -i "s/MSB_SERVICE_PORT =.*/MSB_SERVICE_PORT = \"${MSB_PORT}\"/g" multivimbroker/pub/config/config.py
sed -i "s/AAI_ADDR =.*/AAI_ADDR = \"${AAI_ADDR}\"/g" multivimbroker/pub/config/config.py